diff options
| author | Steven Tamm <steventamm@mac.com> | 2004-12-18 16:36:31 +0000 |
|---|---|---|
| committer | Steven Tamm <steventamm@mac.com> | 2004-12-18 16:36:31 +0000 |
| commit | fbe6152fad0cd271a9bb766f16a70a8fa988d992 (patch) | |
| tree | c45ab5f252570fd6d32b2bba0b2a710af2cb82bb /lisp | |
| parent | c138633412ded34ddb448cca51f52cdf7a3edbab (diff) | |
| download | emacs-fbe6152fad0cd271a9bb766f16a70a8fa988d992.tar.gz emacs-fbe6152fad0cd271a9bb766f16a70a8fa988d992.tar.bz2 emacs-fbe6152fad0cd271a9bb766f16a70a8fa988d992.zip | |
* term/mac-win.el (encoding-vector, mac-font-encoder-list)
(ccl-encode-mac-centraleurroman-font): Use centraleurroman
instead of centraleuropean as the name
* macterm.c (endif, x_font_name_to_mac_font_name): Use
maccentraleurroman instead of maccentraleuropean
(mac_c_string_match, mac_do_list_fonts): Speed up font search by
quickly finding a specific font without needing regexps.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/term/mac-win.el | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 33a3d65fe02..40a11a935cf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2004-12-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * term/mac-win.el (encoding-vector, mac-font-encoder-list) + (ccl-encode-mac-centraleurroman-font): Use centraleurroman + instead of centraleuropean as the name + 2004-12-17 Michael Albinus <michael.albinus@gmx.de> Sync with Tramp 2.0.46. diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 5032135da21..2b5c4d2a994 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -199,7 +199,7 @@ Switch to a buffer editing the last file dropped." (let ((encoding-vector (make-vector 256 nil)) (i 0) - (vec ;; mac-centraleuropean (128..255) -> UCS mapping + (vec ;; mac-centraleurroman (128..255) -> UCS mapping [ #x00C4 ;; 128:LATIN CAPITAL LETTER A WITH DIAERESIS #x0100 ;; 129:LATIN CAPITAL LETTER A WITH MACRON #x0101 ;; 130:LATIN SMALL LETTER A WITH MACRON @@ -339,8 +339,8 @@ Switch to a buffer editing the last file dropped." (setq i (1+ i))) (setq translation-table (make-translation-table-from-vector encoding-vector)) -;; (define-translation-table 'mac-centraleuropean-decoder translation-table) - (define-translation-table 'mac-centraleuropean-encoder +;; (define-translation-table 'mac-centraleurroman-decoder translation-table) + (define-translation-table 'mac-centraleurroman-encoder (char-table-extra-slot translation-table 0))) (let @@ -493,8 +493,8 @@ Switch to a buffer editing the last file dropped." (defvar mac-font-encoder-list '(("mac-roman" mac-roman-encoder ccl-encode-mac-roman-font "%s") - ("mac-centraleuropean" mac-centraleuropean-encoder - ccl-encode-mac-centraleuropean-font "%s ce") + ("mac-centraleurroman" mac-centraleurroman-encoder + ccl-encode-mac-centraleurroman-font "%s ce") ("mac-cyrillic" mac-cyrillic-encoder ccl-encode-mac-cyrillic-font "%s cy"))) @@ -515,15 +515,15 @@ Switch to a buffer editing the last file dropped." (if mac-encoded (aset table c mac-encoded)))))))) -(define-ccl-program ccl-encode-mac-centraleuropean-font +(define-ccl-program ccl-encode-mac-centraleurroman-font `(0 (if (r0 != ,(charset-id 'ascii)) (if (r0 <= ?\x8f) - (translate-character mac-centraleuropean-encoder r0 r1) + (translate-character mac-centraleurroman-encoder r0 r1) ((r1 <<= 7) (r1 |= r2) - (translate-character mac-centraleuropean-encoder r0 r1))))) - "CCL program for Mac Central European font") + (translate-character mac-centraleurroman-encoder r0 r1))))) + "CCL program for Mac Central European Roman font") (define-ccl-program ccl-encode-mac-cyrillic-font `(0 |