diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2004-05-11 09:12:09 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2004-05-11 09:12:09 +0000 |
| commit | d9858e4f1889a61b216ae1f99053846362067ccc (patch) | |
| tree | d0f18015bf1ebe06f489de11b74b4e4b5e98fdc3 /lisp/international/code-pages.el | |
| parent | ab4b17bed77ba635b5654accdfde3fbdf125f3e6 (diff) | |
| parent | a57e8159253e6ddd74b0453de7c526a9895b9576 (diff) | |
| download | emacs-d9858e4f1889a61b216ae1f99053846362067ccc.tar.gz emacs-d9858e4f1889a61b216ae1f99053846362067ccc.tar.bz2 emacs-d9858e4f1889a61b216ae1f99053846362067ccc.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-291
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-292
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-293
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-294
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296
Allow restarting an existing debugger session that's exited
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-298
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-162
Diffstat (limited to 'lisp/international/code-pages.el')
| -rw-r--r-- | lisp/international/code-pages.el | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el index ce88a88dac2..64c430f9383 100644 --- a/lisp/international/code-pages.el +++ b/lisp/international/code-pages.el @@ -4482,20 +4482,18 @@ 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 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-". + (if (coding-system-p w) (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))) -;; Use Unicode font under Windows. Jason Rumney fecit. -(if (fboundp 'w32-add-charset-info) - (unless (boundp 'w32-unicode-charset-defined) - (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))) - (provide 'code-pages) ;;; arch-tag: 8b6e3c73-b271-4198-866d-ea6d0ceff1b2 |