aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2006-01-22 08:20:45 +0000
committerKenichi Handa2006-01-22 08:20:45 +0000
commit5ba93b223ebdb480121c5040e0a1be1460fa9cef (patch)
treeb68a730964050f7e5e5071481396fa10f3f19361
parent407a52c4147ca30652c1d0a8874b58ace52f79f1 (diff)
downloademacs-5ba93b223ebdb480121c5040e0a1be1460fa9cef.tar.gz
emacs-5ba93b223ebdb480121c5040e0a1be1460fa9cef.zip
Don't make cpXXX as an alias here.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/international/code-pages.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e73d399844..0fe791bd459 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12006-01-22 Kenichi Handa <handa@m17n.org>
2
3 * international/code-pages.el: Don't make cpXXX as an alias here.
4
12006-01-21 Martin Rudalics <rudalics@gmx.at> 52006-01-21 Martin Rudalics <rudalics@gmx.at>
2 6
3 * emacs-lisp/find-func.el (find-definition-noselect) 7 * emacs-lisp/find-func.el (find-definition-noselect)
diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el
index 359773ac346..8f3bd176546 100644
--- a/lisp/international/code-pages.el
+++ b/lisp/international/code-pages.el
@@ -4536,7 +4536,6 @@ Return an updated `non-iso-charset-alist'."
4536 ;; we can just concat "cp" to the ANSI codepage we get from the system 4536 ;; we can just concat "cp" to the ANSI codepage we get from the system
4537 ;; and not have to worry about whether it should be "cp" or "windows-". 4537 ;; and not have to worry about whether it should be "cp" or "windows-".
4538 (when (coding-system-p w) 4538 (when (coding-system-p w)
4539 (define-coding-system-alias c w)
4540 ;; Compatibility with codepage.el, though cp... are not the 4539 ;; Compatibility with codepage.el, though cp... are not the
4541 ;; canonical names. 4540 ;; canonical names.
4542 (if (not (assq c non-iso-charset-alist)) 4541 (if (not (assq c non-iso-charset-alist))