summaryrefslogtreecommitdiff
path: root/lisp/language
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-08-08 17:12:29 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-08-08 17:12:29 -0400
commit7815fe1985833c57457882b415a29358991dabdc (patch)
treeab8aabf9ad322c149a6434712c14b93bb93543dc /lisp/language
parent25717ca11cae32e191e3dc9318562190d682f425 (diff)
parente54a1075033073f835596ab666eeed099028beb8 (diff)
downloademacs-7815fe1985833c57457882b415a29358991dabdc.tar.gz
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/language')
-rw-r--r--lisp/language/cyrillic.el7
1 files changed, 0 insertions, 7 deletions
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 7d2f082579f..b293ad1ff0b 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -239,13 +239,6 @@ Support for Russian using koi8-r and the russian-computer input method.")
(documentation . "Support for Tajik using KOI8-T."))
'("Cyrillic"))
-(let ((elt `("microsoft-cp1251" windows-1251 1
- ,(get 'encode-windows-1251 'translation-table)))
- (slot (assoc "microsoft-cp1251" ctext-non-standard-encodings-alist)))
- (if slot
- (setcdr slot (cdr elt))
- (push elt ctext-non-standard-encodings-alist)))
-
(set-language-info-alist
"Bulgarian" `((coding-system windows-1251)
(coding-priority windows-1251)