From 5eb94383393c88afd768c12373d5c42838009313 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Sun, 9 May 2004 15:39:00 +0000 Subject: [PATCH] Fix last change. --- lisp/international/code-pages.el | 10 +++++----- lisp/international/mule-cmds.el | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el index cb81c23b012..58bedc84e59 100644 --- a/lisp/international/code-pages.el +++ b/lisp/international/code-pages.el @@ -4482,13 +4482,13 @@ Return an updated `non-iso-charset-alist'." ?๐ ?๑ ?๒ ?๓ ?๔ ?๕ ?๖ ?๗ ?๘ ?๙ ?๚ ?๛ nil nil nil nil] "ISO-8859-11. This is `thai-tis620' with the addition of no-break-space.") -(dotimes (i 8) +(dotimes (i 9) (let ((w (intern (format "windows-125%d" i))) (c (intern (format "cp125%d" i)))) - (if (coding-system-p c) ; 1251 is in cyrillic.el - (define-coding-system-alias c w) - (if (coding-system-p w) - (define-coding-system-alias w c))) + ;; Define cp125* as aliases for all windows-125*, so on Windows + ;; we can just concat "cp" to the ANSI codepage we get from the system + ;; and not have to worry about whether it should be "cp" or "windows-". + (define-coding-system-alias c w) ;; Compatibility with codepage.el, though cp... are not the ;; canonical names. (push (assoc w non-iso-charset-alist) non-iso-charset-alist))) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index b8c071b8585..24664f9fc64 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2415,7 +2415,7 @@ See also `locale-charset-language-names', `locale-language-names', ;; On Windows, override locale-coding-system, keyboard-coding-system, ;; selection-coding-system with system codepage. - (when (boundp w32-ansi-code-page) + (when (boundp 'w32-ansi-code-page) (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page)))) (when (coding-system-p code-page-coding) (setq locale-coding-system code-page-coding) -- 2.39.2