diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /lisp/w32-fns.el | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/w32-fns.el')
| -rw-r--r-- | lisp/w32-fns.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index cb21d4b08c0..1f54b8577c3 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -381,10 +381,10 @@ bit output with no translation." (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000) (w32-add-charset-info "iso10646-1" 'w32-charset-default t) -;; ;; If unicode windows charset is not defined, use ansi fonts. +;; ;; If Unicode Windows charset is not defined, use ansi fonts. ;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) -;; Prefered names +;; Preferred names (w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950) (w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936) (w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932) |