9 files changed, 263 insertions, 338 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d8e8c6dd52..b4437f350da 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,53 @@
+2005-04-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el (mac-symbol-encoder): Fix mappings of left and
+        right angle brackets.
+
+2005-04-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * tooltip.el (tooltip-use-echo-area): Replace as alias and deprecate.
+
+2005-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/flymake.el (flymake-get-absolute-file-name-basedir):
+        Remove.  Update callers to use expand-file-name instead.
+
+        * subr.el (syntax-class): New function.
+
+        * simple.el (blink-matching-open): Use it.
+
+        * paren.el (show-paren-function): Use it to recognize parens that are
+        also used in 2-char comment markers.
+
+2005-04-19  Lute Kamstra  <lute@gnu.org>
+
+        * loadhist.el (unload-feature): Update for new format of
+        load-history.  Simplify the code.
+
+2005-04-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el: Add coding: tag and set it to iso-2022-7bit.
+        (mac-add-charset-info): New function.  Initialize variable
+        mac-charset-info-alist using it.
+        (mac-centraleurroman, mac-cyrillic): Do not use UCS in table data
+        for translation.
+        (mac-symbol-encoder, mac-dingbats-encoder): New translation table.
+        (mac-font-encoder-list): Add entries for mac-symbol and mac-dingbats.
+        (ccl-encode-mac-symbol-font, ccl-encode-mac-dingbats-font):
+        New CCL programs.
+
+2005-04-19  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (next-buffer, prev-buffer, next-error)
+        (scroll-other-window, keyboard-quit, keyboard-escape-quit)
+        (clone-indirect-buffer-other-window): Move bindings to bindings.el.
+
+        * bindings.el (next-buffer, prev-buffer, next-error)
+        (scroll-other-window, keyboard-quit, keyboard-escape-quit)
+        (clone-indirect-buffer-other-window): Move bindings from simple.el.
+        (next-buffer, prev-buffer): Add C-x C-right and C-x C-left bindings.
+        (next-error, previous-error): Add M-g M-n/n and M-g M-p/p bindings.
+
 2005-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * isearch.el (isearch-edit-string): Make the search-ring available for
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 52a91378275..fa10873c33b 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -628,6 +628,10 @@ language you are using."
 ;; (define-key ctl-x-map "n" 'narrow-to-region)
 ;; (define-key ctl-x-map "w" 'widen)
 
+;; Quitting
+(define-key global-map "\e\e\e" 'keyboard-escape-quit)
+(define-key global-map "\C-g" 'keyboard-quit)
+
 (define-key global-map "\C-j" 'newline-and-indent)
 (define-key global-map "\C-m" 'newline)
 (define-key global-map "\C-o" 'open-line)
@@ -652,9 +656,18 @@ language you are using."
 ;; Many people are used to typing C-/ on X terminals and getting C-_.
 (define-key global-map [?\C-/] 'undo)
 (define-key global-map "\C-_" 'undo)
+;; Richard said that we should not use C-x <uppercase letter> and I have
+;; no idea whereas to bind it.  Any suggestion welcome.  -stef
+;; (define-key ctl-x-map "U" 'undo-only)
+
 (define-key esc-map "!" 'shell-command)
 (define-key esc-map "|" 'shell-command-on-region)
 
+(define-key global-map [?\C-x right] 'next-buffer)
+(define-key global-map [?\C-x C-right] 'next-buffer)
+(define-key global-map [?\C-x left] 'prev-buffer)
+(define-key global-map [?\C-x C-left] 'prev-buffer)
+
 (let ((map minibuffer-local-map))
   (define-key map "\en"   'next-history-element)
   (define-key map [next]  'next-history-element)
@@ -709,6 +722,13 @@ language you are using."
 (define-key esc-map "g\M-g" 'goto-line)
 (define-key esc-map "gg" 'goto-line)
 
+(define-key esc-map "gn" 'next-error)
+(define-key esc-map "g\M-n" 'next-error)
+(define-key ctl-x-map "`" 'next-error)
+
+(define-key esc-map "gp" 'previous-error)
+(define-key esc-map "g\M-p" 'previous-error)
+
 ;;(defun function-key-error ()
 ;;  (interactive)
 ;;  (error "That function key is not bound to anything"))
@@ -737,6 +757,7 @@ language you are using."
 (define-key global-map [C-next]         'scroll-left)
 (define-key global-map [M-next]         'scroll-other-window)
 (define-key global-map [M-prior]        'scroll-other-window-down)
+(define-key esc-map [?\C-\S-v]          'scroll-other-window-down)
 (define-key global-map [end]            'end-of-line)
 (define-key global-map [C-end]          'end-of-buffer)
 (define-key global-map [M-end]          'end-of-buffer-other-window)
@@ -1020,6 +1041,8 @@ language you are using."
 
 (define-key ctl-x-map "z" 'repeat)
 
+(define-key ctl-x-4-map "c" 'clone-indirect-buffer-other-window)
+
 ;; Don't look for autoload cookies in this file.
 ;; Local Variables:
 ;; no-update-autoloads: t
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 473c8dc3bc8..1c71cc6cd07 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -1,6 +1,6 @@
 ;;; loadhist.el --- lisp functions for working with feature groups
 
-;; Copyright (C) 1995, 1998, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2000, 2005 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
@@ -155,16 +155,16 @@ variable `unload-hook-features-list' and could remove features from it
 in the event that the package has done something normally-ill-advised,
 such as redefining an Emacs function."
   (interactive (list (read-feature "Feature: ") current-prefix-arg))
-  (if (not (featurep feature))
-      (error "%s is not a currently loaded feature" (symbol-name feature)))
-  (if (not force)
-      (let* ((file (feature-file feature))
-             (dependents (delete file (copy-sequence (file-dependents file)))))
-        (if dependents
-            (error "Loaded libraries %s depend on %s"
-                   (prin1-to-string dependents) file))))
+  (unless (featurep feature)
+    (error "%s is not a currently loaded feature" (symbol-name feature)))
+  (unless force
+    (let* ((file (feature-file feature))
+           (dependents (delete file (copy-sequence (file-dependents file)))))
+      (when dependents
+        (error "Loaded libraries %s depend on %s"
+               (prin1-to-string dependents) file))))
   (let* ((unload-hook-features-list (feature-symbols feature))
-         (file (car unload-hook-features-list))
+         (file (pop unload-hook-features-list))
          (unload-hook (intern-soft (concat (symbol-name feature)
                                            "-unload-hook"))))
     ;; Try to avoid losing badly when hooks installed in critical
@@ -183,38 +183,39 @@ such as redefining an Emacs function."
       ;; normally works.
       (mapatoms
        (lambda (x)
-         (if (or (and (boundp x)        ; Random hooks.
-                      (consp (symbol-value x))
-                      (string-match "-hooks?\\'" (symbol-name x)))
-                 (and (boundp x)       ; Known abnormal hooks etc.
-                      (memq x unload-feature-special-hooks)))
-             (dolist (y (cdr unload-hook-features-list))
-               (remove-hook x y))))))
-    (if (fboundp 'elp-restore-function) ; remove ELP stuff first
-        (dolist (elt (cdr unload-hook-features-list))
-          (if (symbolp elt)
-              (elp-restore-function elt))))
-    (dolist (x (cdr unload-hook-features-list))
-      (when (consp x)
-        ;; Remove any feature names that this file provided.
-        (if (eq (car x) 'provide)
-            (setq features (delq (cdr x) features)))
-        (when (eq (car x) 'defvar)
-          ;; Kill local values as much as possible.
-          (dolist (buf (buffer-list))
-            (with-current-buffer buf
-              (kill-local-variable (cdr x))))
-          ;; Get rid of the default binding if we can.
-          (unless (local-variable-if-set-p (cdr x))
-            (makunbound (cdr x))))
-        (when (eq (car x) 'defun)
-          (let ((fun (cdr x)))
-            (when (fboundp fun)
-              (if (fboundp 'ad-unadvise)
-                  (ad-unadvise fun))
-              (fmakunbound fun)
-              (let ((aload (get fun 'autoload)))
-                (if aload (fset fun (cons 'autoload aload)))))))))
+         (when (and (boundp x)
+                    (or (and (consp (symbol-value x)) ; Random hooks.
+                             (string-match "-hooks?\\'" (symbol-name x)))
+                        (memq x unload-feature-special-hooks))) ; Known abnormal hooks etc.
+           (dolist (y unload-hook-features-list)
+             (when (eq (car-safe y) 'defun)
+               (remove-hook x (cdr y))))))))
+    (when (fboundp 'elp-restore-function) ; remove ELP stuff first
+      (dolist (elt unload-hook-features-list)
+        (when (symbolp elt)
+          (elp-restore-function elt))))
+    (dolist (x unload-hook-features-list)
+      (if (consp x)
+          (progn
+            ;; Remove any feature names that this file provided.
+            (when (eq (car x) 'provide)
+              (setq features (delq (cdr x) features)))
+            (when (eq (car x) 'defun)
+              (let ((fun (cdr x)))
+                (when (fboundp fun)
+                  (when (fboundp 'ad-unadvise)
+                    (ad-unadvise fun))
+                  (fmakunbound fun)
+                  (let ((aload (get fun 'autoload)))
+                    (when aload 
+                      (fset fun (cons 'autoload aload))))))))
+        ;; Kill local values as much as possible.
+        (dolist (buf (buffer-list))
+          (with-current-buffer buf
+            (kill-local-variable x)))
+        ;; Get rid of the default binding if we can.
+        (unless (local-variable-if-set-p x)
+          (makunbound x))))
     ;; Delete the load-history element for this file.
     (let ((elt (assoc file load-history)))
       (setq load-history (delq elt load-history)))))
diff --git a/lisp/paren.el b/lisp/paren.el
index 63300ce6238..fe2beae4edd 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -1,6 +1,6 @@
 ;;; paren.el --- highlight matching paren
 
-;; Copyright (C) 1993, 1996, 2001, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: rms@gnu.org
 ;; Maintainer: FSF
@@ -139,8 +139,8 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
 (defun show-paren-function ()
   (if show-paren-mode
       (let ((oldpos (point))
-            (dir (cond ((eq (car (syntax-after (1- (point)))) 5) -1)
-                       ((eq (car (syntax-after (point))) 4) 1)))
+            (dir (cond ((eq (syntax-class (syntax-after (1- (point)))) 5) -1)
+                       ((eq (syntax-class (syntax-after (point)))      4) 1)))
             pos mismatch face)
         ;;
         ;; Find the other end of the sexp.
@@ -169,7 +169,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
               ;; kind of paren to match the one we started at.
               (when (integerp pos)
                 (let ((beg (min pos oldpos)) (end (max pos oldpos)))
-                  (unless (eq (car (syntax-after beg)) 8) ;Not syntax `$'.
+                  (unless (eq (syntax-class (syntax-after beg)) 8)
                     (setq mismatch
                           (not (or (eq (char-before end)
                                        ;; This can give nil.
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 7067ddca21c..73d77affdc4 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1765,7 +1765,7 @@ Return full-name.  Names are real, not patched."
                (this-real-name  (nth 1 (nth (1- file-count) files))))
           ;;+(flymake-log 0 "this-dir=%s this-file=%s this-real=%s msg-file=%s" this-dir this-file this-real-name file-name-from-err-msg)
           (when (and this-dir this-file (flymake-same-files
-                                         (flymake-get-absolute-file-name-basedir file-name-from-err-msg this-dir)
+                                         (expand-file-name file-name-from-err-msg this-dir)
                                          this-file))
             (setq real-name this-real-name)))
         (setq file-count (1- file-count)))
@@ -1778,18 +1778,13 @@ Return full-name.  Names are real, not patched."
         (setq real-name file-name-from-err-msg)
       (let* ((base-dirs-count  (length base-dirs)))
         (while (and (not real-name) (> base-dirs-count 0))
-          (let* ((full-name (flymake-get-absolute-file-name-basedir file-name-from-err-msg
-                                                                    (nth (1- base-dirs-count) base-dirs))))
+          (let* ((full-name (expand-file-name file-name-from-err-msg
+                                              (nth (1- base-dirs-count) base-dirs))))
             (if (file-exists-p full-name)
                 (setq real-name full-name))
             (setq base-dirs-count (1- base-dirs-count))))))
     real-name))
 
-(defun flymake-get-absolute-file-name-basedir (file-name dir-name)
-  (if (file-name-absolute-p file-name)
-      file-name
-    (concat dir-name "/" file-name)))
-
 (defun flymake-init-find-buildfile-dir (buffer source-file-name buildfile-name)
   "Find buildfile, store its dir in buffer data and return its dir, if found."
   (let* ((buildfile-dir  (flymake-find-buildfile buildfile-name
diff --git a/lisp/simple.el b/lisp/simple.el
index 1b7b40a367a..cc66ef12d16 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -51,8 +51,6 @@ wait this many seconds after Emacs becomes idle before doing an update."
   "Highlight (un)matching of parens and expressions."
   :group 'matching)
 
-(define-key global-map [?\C-x right] 'next-buffer)
-(define-key global-map [?\C-x left] 'prev-buffer)
 (defun next-buffer ()
   "Switch to the next buffer in cyclic order."
   (interactive)
@@ -258,8 +256,6 @@ See variables `compilation-parse-errors-function' and
 (defalias 'goto-next-locus 'next-error)
 (defalias 'next-match 'next-error)
 
-(define-key ctl-x-map "`" 'next-error)
-
 (defun previous-error (&optional n)
   "Visit previous next-error message and corresponding source code.
 
@@ -1398,9 +1394,6 @@ A numeric argument serves as a repeat count.
 Contrary to `undo', this will not redo a previous undo."
   (interactive "*p")
   (let ((undo-no-redo t)) (undo arg)))
-;; Richard said that we should not use C-x <uppercase letter> and I have
-;; no idea whereas to bind it.  Any suggestion welcome.  -stef
-;; (define-key ctl-x-map "U" 'undo-only)
 
 (defvar undo-in-progress nil
   "Non-nil while performing an undo.
@@ -3635,7 +3628,6 @@ For more details, see the documentation for `scroll-other-window'."
    (if (eq lines '-) nil
      (if (null lines) '-
        (- (prefix-numeric-value lines))))))
-(define-key esc-map [?\C-\S-v] 'scroll-other-window-down)
 
 (defun beginning-of-buffer-other-window (arg)
   "Move point to the beginning of the buffer in the other window.
@@ -4205,11 +4197,12 @@ when it is off screen)."
                    (setq blinkpos (scan-sexps oldpos -1)))
                (error nil)))
            (and blinkpos
-                (not (eq (car (syntax-after blinkpos)) 8)) ;Not syntax '$'.
+                ;; Not syntax '$'.
+                (not (eq (syntax-class (syntax-after blinkpos)) 8))
                 (setq matching-paren
                       (let ((syntax (syntax-after blinkpos)))
                         (and (consp syntax)
-                             (eq (logand (car syntax) 255) 4)
+                             (eq (syntax-class syntax) 4)
                              (cdr syntax)))
                       mismatch
                       (or (null matching-paren)
@@ -4279,8 +4272,6 @@ At top-level, as an editor command, this simply beeps."
   (setq defining-kbd-macro nil)
   (signal 'quit nil))
 
-(define-key global-map "\C-g" 'keyboard-quit)
-
 (defvar buffer-quit-function nil
   "Function to call to \"quit\" the current buffer, or nil if none.
 \\[keyboard-escape-quit] calls this function when its more local actions
@@ -4323,7 +4314,6 @@ specification for `play-sound'."
     (push 'sound sound)
     (play-sound sound)))
 
-(define-key global-map "\e\e\e" 'keyboard-escape-quit)
 
 (defcustom read-mail-command 'rmail
   "*Your preference for a mail reading package.
@@ -5116,7 +5106,6 @@ the front of the list of recently selected ones."
     (set-buffer buffer)
     (clone-indirect-buffer nil t norecord)))
 
-(define-key ctl-x-4-map "c" 'clone-indirect-buffer-other-window)
 
 ;;; Handling of Backspace and Delete keys.
 
diff --git a/lisp/subr.el b/lisp/subr.el
index adaf2f481c9..a1384ab685d 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2298,6 +2298,10 @@ from `standard-syntax-table' otherwise."
       (if (consp st) st
         (aref (or st (syntax-table)) (char-after pos))))))
 
+(defun syntax-class (syntax)
+  "Return the syntax class part of the syntax descriptor SYNTAX."
+  (logand (car syntax) 255))
+
 (defun add-to-invisibility-spec (arg)
   "Add elements to `buffer-invisibility-spec'.
 See documentation for `buffer-invisibility-spec' for the kind of elements
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index d5fd541c727..7cdaa2b7257 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1,4 +1,4 @@
-;;; mac-win.el --- parse switches controlling interface with Mac window system
+;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005
 ;;   Free Software Foundation, Inc.
@@ -1105,6 +1105,31 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
         base
       (coding-system-change-eol-conversion base 'mac)))
   "Coding system derived from the system script code.")
+
+(defun mac-add-charset-info (xlfd-charset mac-text-encoding)
+  "Function to add character sets to display with Mac fonts.
+Creates entries in `mac-charset-info-alist'.
+XLFD-CHARSET is a string which will appear in the XLFD font name
+to identify the character set.  MAC-TEXT-ENCODING is the
+correspoinding TextEncodingBase value."
+  (add-to-list 'mac-charset-info-alist
+               (list xlfd-charset mac-text-encoding
+                     (cdr (assq mac-text-encoding
+                                mac-script-code-coding-systems)))))
+
+(setq mac-charset-info-alist nil)
+(mac-add-charset-info "mac-roman" 0)
+(mac-add-charset-info "jisx0208.1983-sjis" 1)
+(mac-add-charset-info "jisx0201.1976-0" 1)
+(mac-add-charset-info "big5-0" 2)
+(mac-add-charset-info "ksc5601.1989-0" 3)
+(mac-add-charset-info "mac-cyrillic" 7)
+(mac-add-charset-info "gb2312.1980-0" 25)
+(mac-add-charset-info "mac-centraleurroman" 29)
+(mac-add-charset-info "mac-symbol" 33)
+(mac-add-charset-info "adobe-fontspecific" 33) ; for X-Symbol
+(mac-add-charset-info "mac-dingbats" 34)
+
 
 ;;;; Keyboard layout/language change events
 (defun mac-handle-language-change (event)
@@ -1166,289 +1191,105 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
 
 (cp-make-coding-system
  mac-centraleurroman
- (apply
-  'vector
-  (mapcar
-   (lambda (c) (decode-char 'ucs c))
-   ;; 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
-        #x00C9  ;; 131:LATIN CAPITAL LETTER E WITH ACUTE
-        #x0104  ;; 132:LATIN CAPITAL LETTER A WITH OGONEK
-        #x00D6  ;; 133:LATIN CAPITAL LETTER O WITH DIAERESIS
-        #x00DC  ;; 134:LATIN CAPITAL LETTER U WITH DIAERESIS
-        #x00E1  ;; 135:LATIN SMALL LETTER A WITH ACUTE
-        #x0105  ;; 136:LATIN SMALL LETTER A WITH OGONEK
-        #x010C  ;; 137:LATIN CAPITAL LETTER C WITH CARON
-        #x00E4  ;; 138:LATIN SMALL LETTER A WITH DIAERESIS
-        #x010D  ;; 139:LATIN SMALL LETTER C WITH CARON
-        #x0106  ;; 140:LATIN CAPITAL LETTER C WITH ACUTE
-        #x0107  ;; 141:LATIN SMALL LETTER C WITH ACUTE
-        #x00E9  ;; 142:LATIN SMALL LETTER E WITH ACUTE
-        #x0179  ;; 143:LATIN CAPITAL LETTER Z WITH ACUTE
-        #x017A  ;; 144:LATIN SMALL LETTER Z WITH ACUTE
-        #x010E  ;; 145:LATIN CAPITAL LETTER D WITH CARON
-        #x00ED  ;; 146:LATIN SMALL LETTER I WITH ACUTE
-        #x010F  ;; 147:LATIN SMALL LETTER D WITH CARON
-        #x0112  ;; 148:LATIN CAPITAL LETTER E WITH MACRON
-        #x0113  ;; 149:LATIN SMALL LETTER E WITH MACRON
-        #x0116  ;; 150:LATIN CAPITAL LETTER E WITH DOT ABOVE
-        #x00F3  ;; 151:LATIN SMALL LETTER O WITH ACUTE
-        #x0117  ;; 152:LATIN SMALL LETTER E WITH DOT ABOVE
-        #x00F4  ;; 153:LATIN SMALL LETTER O WITH CIRCUMFLEX
-        #x00F6  ;; 154:LATIN SMALL LETTER O WITH DIAERESIS
-        #x00F5  ;; 155:LATIN SMALL LETTER O WITH TILDE
-        #x00FA  ;; 156:LATIN SMALL LETTER U WITH ACUTE
-        #x011A  ;; 157:LATIN CAPITAL LETTER E WITH CARON
-        #x011B  ;; 158:LATIN SMALL LETTER E WITH CARON
-        #x00FC  ;; 159:LATIN SMALL LETTER U WITH DIAERESIS
-        #x2020  ;; 160:DAGGER
-        #x00B0  ;; 161:DEGREE SIGN
-        #x0118  ;; 162:LATIN CAPITAL LETTER E WITH OGONEK
-        #x00A3  ;; 163:POUND SIGN
-        #x00A7  ;; 164:SECTION SIGN
-        #x2022  ;; 165:BULLET
-        #x00B6  ;; 166:PILCROW SIGN
-        #x00DF  ;; 167:LATIN SMALL LETTER SHARP S
-        #x00AE  ;; 168:REGISTERED SIGN
-        #x00A9  ;; 169:COPYRIGHT SIGN
-        #x2122  ;; 170:TRADE MARK SIGN
-        #x0119  ;; 171:LATIN SMALL LETTER E WITH OGONEK
-        #x00A8  ;; 172:DIAERESIS
-        #x2260  ;; 173:NOT EQUAL TO
-        #x0123  ;; 174:LATIN SMALL LETTER G WITH CEDILLA
-        #x012E  ;; 175:LATIN CAPITAL LETTER I WITH OGONEK
-        #x012F  ;; 176:LATIN SMALL LETTER I WITH OGONEK
-        #x012A  ;; 177:LATIN CAPITAL LETTER I WITH MACRON
-        #x2264  ;; 178:LESS-THAN OR EQUAL TO
-        #x2265  ;; 179:GREATER-THAN OR EQUAL TO
-        #x012B  ;; 180:LATIN SMALL LETTER I WITH MACRON
-        #x0136  ;; 181:LATIN CAPITAL LETTER K WITH CEDILLA
-        #x2202  ;; 182:PARTIAL DIFFERENTIAL
-        #x2211  ;; 183:N-ARY SUMMATION
-        #x0142  ;; 184:LATIN SMALL LETTER L WITH STROKE
-        #x013B  ;; 185:LATIN CAPITAL LETTER L WITH CEDILLA
-        #x013C  ;; 186:LATIN SMALL LETTER L WITH CEDILLA
-        #x013D  ;; 187:LATIN CAPITAL LETTER L WITH CARON
-        #x013E  ;; 188:LATIN SMALL LETTER L WITH CARON
-        #x0139  ;; 189:LATIN CAPITAL LETTER L WITH ACUTE
-        #x013A  ;; 190:LATIN SMALL LETTER L WITH ACUTE
-        #x0145  ;; 191:LATIN CAPITAL LETTER N WITH CEDILLA
-        #x0146  ;; 192:LATIN SMALL LETTER N WITH CEDILLA
-        #x0143  ;; 193:LATIN CAPITAL LETTER N WITH ACUTE
-        #x00AC  ;; 194:NOT SIGN
-        #x221A  ;; 195:SQUARE ROOT
-        #x0144  ;; 196:LATIN SMALL LETTER N WITH ACUTE
-        #x0147  ;; 197:LATIN CAPITAL LETTER N WITH CARON
-        #x2206  ;; 198:INCREMENT
-        #x00AB  ;; 199:LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-        #x00BB  ;; 200:RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-        #x2026  ;; 201:HORIZONTAL ELLIPSIS
-        #x00A0  ;; 202:NO-BREAK SPACE
-        #x0148  ;; 203:LATIN SMALL LETTER N WITH CARON
-        #x0150  ;; 204:LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-        #x00D5  ;; 205:LATIN CAPITAL LETTER O WITH TILDE
-        #x0151  ;; 206:LATIN SMALL LETTER O WITH DOUBLE ACUTE
-        #x014C  ;; 207:LATIN CAPITAL LETTER O WITH MACRON
-        #x2013  ;; 208:EN DASH
-        #x2014  ;; 209:EM DASH
-        #x201C  ;; 210:LEFT DOUBLE QUOTATION MARK
-        #x201D  ;; 211:RIGHT DOUBLE QUOTATION MARK
-        #x2018  ;; 212:LEFT SINGLE QUOTATION MARK
-        #x2019  ;; 213:RIGHT SINGLE QUOTATION MARK
-        #x00F7  ;; 214:DIVISION SIGN
-        #x25CA  ;; 215:LOZENGE
-        #x014D  ;; 216:LATIN SMALL LETTER O WITH MACRON
-        #x0154  ;; 217:LATIN CAPITAL LETTER R WITH ACUTE
-        #x0155  ;; 218:LATIN SMALL LETTER R WITH ACUTE
-        #x0158  ;; 219:LATIN CAPITAL LETTER R WITH CARON
-        #x2039  ;; 220:SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-        #x203A  ;; 221:SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-        #x0159  ;; 222:LATIN SMALL LETTER R WITH CARON
-        #x0156  ;; 223:LATIN CAPITAL LETTER R WITH CEDILLA
-        #x0157  ;; 224:LATIN SMALL LETTER R WITH CEDILLA
-        #x0160  ;; 225:LATIN CAPITAL LETTER S WITH CARON
-        #x201A  ;; 226:SINGLE LOW-9 QUOTATION MARK
-        #x201E  ;; 227:DOUBLE LOW-9 QUOTATION MARK
-        #x0161  ;; 228:LATIN SMALL LETTER S WITH CARON
-        #x015A  ;; 229:LATIN CAPITAL LETTER S WITH ACUTE
-        #x015B  ;; 230:LATIN SMALL LETTER S WITH ACUTE
-        #x00C1  ;; 231:LATIN CAPITAL LETTER A WITH ACUTE
-        #x0164  ;; 232:LATIN CAPITAL LETTER T WITH CARON
-        #x0165  ;; 233:LATIN SMALL LETTER T WITH CARON
-        #x00CD  ;; 234:LATIN CAPITAL LETTER I WITH ACUTE
-        #x017D  ;; 235:LATIN CAPITAL LETTER Z WITH CARON
-        #x017E  ;; 236:LATIN SMALL LETTER Z WITH CARON
-        #x016A  ;; 237:LATIN CAPITAL LETTER U WITH MACRON
-        #x00D3  ;; 238:LATIN CAPITAL LETTER O WITH ACUTE
-        #x00D4  ;; 239:LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-        #x016B  ;; 240:LATIN SMALL LETTER U WITH MACRON
-        #x016E  ;; 241:LATIN CAPITAL LETTER U WITH RING ABOVE
-        #x00DA  ;; 242:LATIN CAPITAL LETTER U WITH ACUTE
-        #x016F  ;; 243:LATIN SMALL LETTER U WITH RING ABOVE
-        #x0170  ;; 244:LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-        #x0171  ;; 245:LATIN SMALL LETTER U WITH DOUBLE ACUTE
-        #x0172  ;; 246:LATIN CAPITAL LETTER U WITH OGONEK
-        #x0173  ;; 247:LATIN SMALL LETTER U WITH OGONEK
-        #x00DD  ;; 248:LATIN CAPITAL LETTER Y WITH ACUTE
-        #x00FD  ;; 249:LATIN SMALL LETTER Y WITH ACUTE
-        #x0137  ;; 250:LATIN SMALL LETTER K WITH CEDILLA
-        #x017B  ;; 251:LATIN CAPITAL LETTER Z WITH DOT ABOVE
-        #x0141  ;; 252:LATIN CAPITAL LETTER L WITH STROKE
-        #x017C  ;; 253:LATIN SMALL LETTER Z WITH DOT ABOVE
-        #x0122  ;; 254:LATIN CAPITAL LETTER G WITH CEDILLA
-        #x02C7  ;; 255:CARON
-        ]))
+ [?\,AD(B ?\$,1  (B ?\$,1 !(B ?\,AI(B ?\$,1 $(B ?\,AV(B ?\,A\(B ?\,Aa(B ?\$,1 %(B ?\$,1 ,(B ?\,Ad(B ?\$,1 -(B ?\$,1 &(B ?\$,1 '(B ?\,Ai(B ?\$,1!9(B
+  ?\$,1!:(B ?\$,1 .(B ?\,Am(B ?\$,1 /(B ?\$,1 2(B ?\$,1 3(B ?\$,1 6(B ?\,As(B ?\$,1 7(B ?\,At(B ?\,Av(B ?\,Au(B ?\,Az(B ?\$,1 :(B ?\$,1 ;(B ?\,A|(B
+  ?\$,1s (B ?\,A0(B ?\$,1 8(B ?\,A#(B ?\,A'(B ?\$,1s"(B ?\,A6(B ?\,A_(B ?\,A.(B ?\,A)(B ?\$,1ub(B ?\$,1 9(B ?\,A((B ?\$,1y (B ?\$,1 C(B ?\$,1 N(B
+  ?\$,1 O(B ?\$,1 J(B ?\$,1y$(B ?\$,1y%(B ?\$,1 K(B ?\$,1 V(B ?\$,1x"(B ?\$,1x1(B ?\$,1 b(B ?\$,1 [(B ?\$,1 \(B ?\$,1 ](B ?\$,1 ^(B ?\$,1 Y(B ?\$,1 Z(B ?\$,1 e(B
+  ?\$,1 f(B ?\$,1 c(B ?\,A,(B ?\$,1x:(B ?\$,1 d(B ?\$,1 g(B ?\$,1x&(B ?\,A+(B ?\,A;(B ?\$,1s&(B ?\,A (B ?\$,1 h(B ?\$,1 p(B ?\,AU(B ?\$,1 q(B ?\$,1 l(B
+  ?\$,1rs(B ?\$,1rt(B ?\$,1r|(B ?\$,1r}(B ?\$,1rx(B ?\$,1ry(B ?\,Aw(B ?\$,2"*(B ?\$,1 m(B ?\$,1 t(B ?\$,1 u(B ?\$,1 x(B ?\$,1s9(B ?\$,1s:(B ?\$,1 y(B ?\$,1 v(B
+  ?\$,1 w(B ?\$,1! (B ?\$,1rz(B ?\$,1r~(B ?\$,1!!(B ?\$,1 z(B ?\$,1 {(B ?\,AA(B ?\$,1!$(B ?\$,1!%(B ?\,AM(B ?\$,1!=(B ?\$,1!>(B ?\$,1!*(B ?\,AS(B ?\,AT(B
+  ?\$,1!+(B ?\$,1!.(B ?\,AZ(B ?\$,1!/(B ?\$,1!0(B ?\$,1!1(B ?\$,1!2(B ?\$,1!3(B ?\,A](B ?\,A}(B ?\$,1 W(B ?\$,1!;(B ?\$,1 a(B ?\$,1!<(B ?\$,1 B(B ?\$,1$g(B]
  "Mac Central European Roman Encoding (MIME:x-mac-centraleurroman).")
 (coding-system-put 'mac-centraleurroman 'mime-charset 'x-mac-centraleurroman)
 
 (cp-make-coding-system
  mac-cyrillic
- (apply
-  'vector
-  (mapcar
-   (lambda (c) (decode-char 'ucs c))
-   ;; mac-cyrillic (128..255) -> UCS mapping
-   [    #x0410  ;; 128:CYRILLIC CAPITAL LETTER A
-        #x0411  ;; 129:CYRILLIC CAPITAL LETTER BE
-        #x0412  ;; 130:CYRILLIC CAPITAL LETTER VE
-        #x0413  ;; 131:CYRILLIC CAPITAL LETTER GHE
-        #x0414  ;; 132:CYRILLIC CAPITAL LETTER DE
-        #x0415  ;; 133:CYRILLIC CAPITAL LETTER IE
-        #x0416  ;; 134:CYRILLIC CAPITAL LETTER ZHE
-        #x0417  ;; 135:CYRILLIC CAPITAL LETTER ZE
-        #x0418  ;; 136:CYRILLIC CAPITAL LETTER I
-        #x0419  ;; 137:CYRILLIC CAPITAL LETTER SHORT I
-        #x041A  ;; 138:CYRILLIC CAPITAL LETTER KA
-        #x041B  ;; 139:CYRILLIC CAPITAL LETTER EL
-        #x041C  ;; 140:CYRILLIC CAPITAL LETTER EM
-        #x041D  ;; 141:CYRILLIC CAPITAL LETTER EN
-        #x041E  ;; 142:CYRILLIC CAPITAL LETTER O
-        #x041F  ;; 143:CYRILLIC CAPITAL LETTER PE
-        #x0420  ;; 144:CYRILLIC CAPITAL LETTER ER
-        #x0421  ;; 145:CYRILLIC CAPITAL LETTER ES
-        #x0422  ;; 146:CYRILLIC CAPITAL LETTER TE
-        #x0423  ;; 147:CYRILLIC CAPITAL LETTER U
-        #x0424  ;; 148:CYRILLIC CAPITAL LETTER EF
-        #x0425  ;; 149:CYRILLIC CAPITAL LETTER HA
-        #x0426  ;; 150:CYRILLIC CAPITAL LETTER TSE
-        #x0427  ;; 151:CYRILLIC CAPITAL LETTER CHE
-        #x0428  ;; 152:CYRILLIC CAPITAL LETTER SHA
-        #x0429  ;; 153:CYRILLIC CAPITAL LETTER SHCHA
-        #x042A  ;; 154:CYRILLIC CAPITAL LETTER HARD SIGN
-        #x042B  ;; 155:CYRILLIC CAPITAL LETTER YERU
-        #x042C  ;; 156:CYRILLIC CAPITAL LETTER SOFT SIGN
-        #x042D  ;; 157:CYRILLIC CAPITAL LETTER E
-        #x042E  ;; 158:CYRILLIC CAPITAL LETTER YU
-        #x042F  ;; 159:CYRILLIC CAPITAL LETTER YA
-        #x2020  ;; 160:DAGGER
-        #x00B0  ;; 161:DEGREE SIGN
-        #x0490  ;; 162:CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-        #x00A3  ;; 163:POUND SIGN
-        #x00A7  ;; 164:SECTION SIGN
-        #x2022  ;; 165:BULLET
-        #x00B6  ;; 166:PILCROW SIGN
-        #x0406  ;; 167:CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-        #x00AE  ;; 168:REGISTERED SIGN
-        #x00A9  ;; 169:COPYRIGHT SIGN
-        #x2122  ;; 170:TRADE MARK SIGN
-        #x0402  ;; 171:CYRILLIC CAPITAL LETTER DJE
-        #x0452  ;; 172:CYRILLIC SMALL LETTER DJE
-        #x2260  ;; 173:NOT EQUAL TO
-        #x0403  ;; 174:CYRILLIC CAPITAL LETTER GJE
-        #x0453  ;; 175:CYRILLIC SMALL LETTER GJE
-        #x221E  ;; 176:INFINITY
-        #x00B1  ;; 177:PLUS-MINUS SIGN
-        #x2264  ;; 178:LESS-THAN OR EQUAL TO
-        #x2265  ;; 179:GREATER-THAN OR EQUAL TO
-        #x0456  ;; 180:CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-        #x00B5  ;; 181:MICRO SIGN
-        #x0491  ;; 182:CYRILLIC SMALL LETTER GHE WITH UPTURN
-        #x0408  ;; 183:CYRILLIC CAPITAL LETTER JE
-        #x0404  ;; 184:CYRILLIC CAPITAL LETTER UKRAINIAN IE
-        #x0454  ;; 185:CYRILLIC SMALL LETTER UKRAINIAN IE
-        #x0407  ;; 186:CYRILLIC CAPITAL LETTER YI
-        #x0457  ;; 187:CYRILLIC SMALL LETTER YI
-        #x0409  ;; 188:CYRILLIC CAPITAL LETTER LJE
-        #x0459  ;; 189:CYRILLIC SMALL LETTER LJE
-        #x040A  ;; 190:CYRILLIC CAPITAL LETTER NJE
-        #x045A  ;; 191:CYRILLIC SMALL LETTER NJE
-        #x0458  ;; 192:CYRILLIC SMALL LETTER JE
-        #x0405  ;; 193:CYRILLIC CAPITAL LETTER DZE
-        #x00AC  ;; 194:NOT SIGN
-        #x221A  ;; 195:SQUARE ROOT
-        #x0192  ;; 196:LATIN SMALL LETTER F WITH HOOK
-        #x2248  ;; 197:ALMOST EQUAL TO
-        #x2206  ;; 198:INCREMENT
-        #x00AB  ;; 199:LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-        #x00BB  ;; 200:RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-        #x2026  ;; 201:HORIZONTAL ELLIPSIS
-        #x00A0  ;; 202:NO-BREAK SPACE
-        #x040B  ;; 203:CYRILLIC CAPITAL LETTER TSHE
-        #x045B  ;; 204:CYRILLIC SMALL LETTER TSHE
-        #x040C  ;; 205:CYRILLIC CAPITAL LETTER KJE
-        #x045C  ;; 206:CYRILLIC SMALL LETTER KJE
-        #x0455  ;; 207:CYRILLIC SMALL LETTER DZE
-        #x2013  ;; 208:EN DASH
-        #x2014  ;; 209:EM DASH
-        #x201C  ;; 210:LEFT DOUBLE QUOTATION MARK
-        #x201D  ;; 211:RIGHT DOUBLE QUOTATION MARK
-        #x2018  ;; 212:LEFT SINGLE QUOTATION MARK
-        #x2019  ;; 213:RIGHT SINGLE QUOTATION MARK
-        #x00F7  ;; 214:DIVISION SIGN
-        #x201E  ;; 215:DOUBLE LOW-9 QUOTATION MARK
-        #x040E  ;; 216:CYRILLIC CAPITAL LETTER SHORT U
-        #x045E  ;; 217:CYRILLIC SMALL LETTER SHORT U
-        #x040F  ;; 218:CYRILLIC CAPITAL LETTER DZHE
-        #x045F  ;; 219:CYRILLIC SMALL LETTER DZHE
-        #x2116  ;; 220:NUMERO SIGN
-        #x0401  ;; 221:CYRILLIC CAPITAL LETTER IO
-        #x0451  ;; 222:CYRILLIC SMALL LETTER IO
-        #x044F  ;; 223:CYRILLIC SMALL LETTER YA
-        #x0430  ;; 224:CYRILLIC SMALL LETTER A
-        #x0431  ;; 225:CYRILLIC SMALL LETTER BE
-        #x0432  ;; 226:CYRILLIC SMALL LETTER VE
-        #x0433  ;; 227:CYRILLIC SMALL LETTER GHE
-        #x0434  ;; 228:CYRILLIC SMALL LETTER DE
-        #x0435  ;; 229:CYRILLIC SMALL LETTER IE
-        #x0436  ;; 230:CYRILLIC SMALL LETTER ZHE
-        #x0437  ;; 231:CYRILLIC SMALL LETTER ZE
-        #x0438  ;; 232:CYRILLIC SMALL LETTER I
-        #x0439  ;; 233:CYRILLIC SMALL LETTER SHORT I
-        #x043A  ;; 234:CYRILLIC SMALL LETTER KA
-        #x043B  ;; 235:CYRILLIC SMALL LETTER EL
-        #x043C  ;; 236:CYRILLIC SMALL LETTER EM
-        #x043D  ;; 237:CYRILLIC SMALL LETTER EN
-        #x043E  ;; 238:CYRILLIC SMALL LETTER O
-        #x043F  ;; 239:CYRILLIC SMALL LETTER PE
-        #x0440  ;; 240:CYRILLIC SMALL LETTER ER
-        #x0441  ;; 241:CYRILLIC SMALL LETTER ES
-        #x0442  ;; 242:CYRILLIC SMALL LETTER TE
-        #x0443  ;; 243:CYRILLIC SMALL LETTER U
-        #x0444  ;; 244:CYRILLIC SMALL LETTER EF
-        #x0445  ;; 245:CYRILLIC SMALL LETTER HA
-        #x0446  ;; 246:CYRILLIC SMALL LETTER TSE
-        #x0447  ;; 247:CYRILLIC SMALL LETTER CHE
-        #x0448  ;; 248:CYRILLIC SMALL LETTER SHA
-        #x0449  ;; 249:CYRILLIC SMALL LETTER SHCHA
-        #x044A  ;; 250:CYRILLIC SMALL LETTER HARD SIGN
-        #x044B  ;; 251:CYRILLIC SMALL LETTER YERU
-        #x044C  ;; 252:CYRILLIC SMALL LETTER SOFT SIGN
-        #x044D  ;; 253:CYRILLIC SMALL LETTER E
-        #x044E  ;; 254:CYRILLIC SMALL LETTER YU
-        #x20AC  ;; 255:EURO SIGN
-        ]))
+ [?\$,1(0(B ?\$,1(1(B ?\$,1(2(B ?\$,1(3(B ?\$,1(4(B ?\$,1(5(B ?\$,1(6(B ?\$,1(7(B ?\$,1(8(B ?\$,1(9(B ?\$,1(:(B ?\$,1(;(B ?\$,1(<(B ?\$,1(=(B ?\$,1(>(B ?\$,1(?(B
+  ?\$,1(@(B ?\$,1(A(B ?\$,1(B(B ?\$,1(C(B ?\$,1(D(B ?\$,1(E(B ?\$,1(F(B ?\$,1(G(B ?\$,1(H(B ?\$,1(I(B ?\$,1(J(B ?\$,1(K(B ?\$,1(L(B ?\$,1(M(B ?\$,1(N(B ?\$,1(O(B
+  ?\$,1s (B ?\,A0(B ?\$,1)P(B ?\,A#(B ?\,A'(B ?\$,1s"(B ?\,A6(B ?\$,1(&(B ?\,A.(B ?\,A)(B ?\$,1ub(B ?\$,1("(B ?\$,1(r(B ?\$,1y (B ?\$,1(#(B ?\$,1(s(B
+  ?\$,1x>(B ?\,A1(B ?\$,1y$(B ?\$,1y%(B ?\$,1(v(B ?\,A5(B ?\$,1)Q(B ?\$,1(((B ?\$,1($(B ?\$,1(t(B ?\$,1('(B ?\$,1(w(B ?\$,1()(B ?\$,1(y(B ?\$,1(*(B ?\$,1(z(B
+  ?\$,1(x(B ?\$,1(%(B ?\,A,(B ?\$,1x:(B ?\$,1!R(B ?\$,1xh(B ?\$,1x&(B ?\,A+(B ?\,A;(B ?\$,1s&(B ?\,A (B ?\$,1(+(B ?\$,1({(B ?\$,1(,(B ?\$,1(|(B ?\$,1(u(B
+  ?\$,1rs(B ?\$,1rt(B ?\$,1r|(B ?\$,1r}(B ?\$,1rx(B ?\$,1ry(B ?\,Aw(B ?\$,1r~(B ?\$,1(.(B ?\$,1(~(B ?\$,1(/(B ?\$,1((B ?\$,1uV(B ?\$,1(!(B ?\$,1(q(B ?\$,1(o(B
+  ?\$,1(P(B ?\$,1(Q(B ?\$,1(R(B ?\$,1(S(B ?\$,1(T(B ?\$,1(U(B ?\$,1(V(B ?\$,1(W(B ?\$,1(X(B ?\$,1(Y(B ?\$,1(Z(B ?\$,1([(B ?\$,1(\(B ?\$,1(](B ?\$,1(^(B ?\$,1(_(B
+  ?\$,1(`(B ?\$,1(a(B ?\$,1(b(B ?\$,1(c(B ?\$,1(d(B ?\$,1(e(B ?\$,1(f(B ?\$,1(g(B ?\$,1(h(B ?\$,1(i(B ?\$,1(j(B ?\$,1(k(B ?\$,1(l(B ?\$,1(m(B ?\$,1(n(B ?\$,1tL(B]
  "Mac Cyrillic Encoding (MIME:x-mac-cyrillic).")
 (coding-system-put 'mac-cyrillic 'mime-charset 'x-mac-cyrillic)
 
+(let
+    ((encoding-vector
+      (vconcat
+       (make-vector 32 nil)
+       ;; mac-symbol (32..126) -> emacs-mule mapping
+       [?\  ?\! ?\$,1x (B ?\# ?\$,1x#(B ?\% ?\& ?\$,1x-(B ?\( ?\) ?\$,1x7(B ?\+ ?\, ?\$,1x2(B ?\. ?\/
+        ?\0 ?\1 ?\2 ?\3 ?\4 ?\5 ?\6 ?\7 ?\8 ?\9 ?\: ?\; ?\< ?\= ?\> ?\?
+        ?\$,1xe(B ?\$,1&q(B ?\$,1&r(B ?\$,1''(B ?\$,1&t(B ?\$,1&u(B ?\$,1'&(B ?\$,1&s(B ?\$,1&w(B ?\$,1&y(B ?\$,1'Q(B ?\$,1&z(B ?\$,1&{(B ?\$,1&|(B ?\$,1&}(B ?\$,1&(B
+        ?\$,1' (B ?\$,1&x(B ?\$,1'!(B ?\$,1'#(B ?\$,1'$(B ?\$,1'%(B ?\$,1'B(B ?\$,1')(B ?\$,1&~(B ?\$,1'((B ?\$,1&v(B ?\[ ?\$,1xT(B ?\] ?\$,1ye(B ?\_
+        ?\$,3bE(B ?\$,1'1(B ?\$,1'2(B ?\$,1'G(B ?\$,1'4(B ?\$,1'5(B ?\$,1'F(B ?\$,1'3(B ?\$,1'7(B ?\$,1'9(B ?\$,1'U(B ?\$,1':(B ?\$,1';(B ?\$,1'<(B ?\$,1'=(B ?\$,1'?(B
+        ?\$,1'@(B ?\$,1'8(B ?\$,1'A(B ?\$,1'C(B ?\$,1'D(B ?\$,1'E(B ?\$,1'V(B ?\$,1'I(B ?\$,1'>(B ?\$,1'H(B ?\$,1'6(B ?\{ ?\| ?\} ?\$,1x\(B]
+       (make-vector (- 160 127) nil)
+       ;; mac-symbol (160..254) -> emacs-mule mapping
+       ;; Mapping of the following characters are changed from the
+       ;; original one:
+       ;; 0xE2  0x00AE+0xF87F -> 0x00AE # REGISTERED SIGN, alternate: sans serif
+       ;; 0xE3  0x00A9+0xF87F -> 0x00A9 # COPYRIGHT SIGN, alternate: sans serif
+       ;; 0xE4  0x2122+0xF87F -> 0x2122 # TRADE MARK SIGN, alternate: sans serif
+       [?\$,1tL(B ?\$,1'R(B ?\$,1s2(B ?\$,1y$(B ?\$,1sD(B ?\$,1x>(B ?\$,1!R(B ?\$,2#c(B ?\$,2#f(B ?\$,2#e(B ?\$,2#`(B ?\$,1vt(B ?\$,1vp(B ?\$,1vq(B ?\$,1vr(B ?\$,1vs(B
+        ?\,A0(B ?\,A1(B ?\$,1s3(B ?\$,1y%(B ?\,AW(B ?\$,1x=(B ?\$,1x"(B ?\$,1s"(B ?\,Aw(B ?\$,1y (B ?\$,1y!(B ?\$,1xh(B ?\$,1s&(B ?\$,1|p(B ?\$,1|O(B ?\$,1w5(B
+        ?\$,1uu(B ?\$,1uQ(B ?\$,1u\(B ?\$,1uX(B ?\$,1yW(B ?\$,1yU(B ?\$,1x%(B ?\$,1xI(B ?\$,1xJ(B ?\$,1yC(B ?\$,1yG(B ?\$,1yD(B ?\$,1yB(B ?\$,1yF(B ?\$,1x((B ?\$,1x)(B
+        ?\$,1x@(B ?\$,1x'(B ?\,A.(B ?\,A)(B ?\$,1ub(B ?\$,1x/(B ?\$,1x:(B ?\$,1z%(B ?\,A,(B ?\$,1xG(B ?\$,1xH(B ?\$,1wT(B ?\$,1wP(B ?\$,1wQ(B ?\$,1wR(B ?\$,1wS(B
+        ?\$,2"*(B ?\$,2=H(B ?\,A.(B ?\,A)(B ?\$,1ub(B ?\$,1x1(B ?\$,1|;(B ?\$,1|<(B ?\$,1|=(B ?\$,1|A(B ?\$,1|B(B ?\$,1|C(B ?\$,1|G(B ?\$,1|H(B ?\$,1|I(B ?\$,1|J(B
+        ?\$,3b_(B ?\$,2=I(B ?\$,1xK(B ?\$,1{ (B ?\$,1|N(B ?\$,1{!(B ?\$,1|>(B ?\$,1|?(B ?\$,1|@(B ?\$,1|D(B ?\$,1|E(B ?\$,1|F(B ?\$,1|K(B ?\$,1|L(B ?\$,1|M(B
+        nil]))
+     translation-table)
+  (setq translation-table
+        (make-translation-table-from-vector encoding-vector))
+;;  (define-translation-table 'mac-symbol-decoder translation-table)
+  (define-translation-table 'mac-symbol-encoder
+    (char-table-extra-slot translation-table 0)))
+
+(let
+    ((encoding-vector 
+      (vconcat
+       (make-vector 32 nil)
+       ;; mac-dingbats (32..126) -> emacs-mule mapping
+       [?\  ?\$,2%A(B ?\$,2%B(B ?\$,2%C(B ?\$,2%D(B ?\$,2"n(B ?\$,2%F(B ?\$,2%G(B ?\$,2%H(B ?\$,2%I(B ?\$,2"{(B ?\$,2"~(B ?\$,2%L(B ?\$,2%M(B ?\$,2%N(B ?\$,2%O(B
+        ?\$,2%P(B ?\$,2%Q(B ?\$,2%R(B ?\$,2%S(B ?\$,2%T(B ?\$,2%U(B ?\$,2%V(B ?\$,2%W(B ?\$,2%X(B ?\$,2%Y(B ?\$,2%Z(B ?\$,2%[(B ?\$,2%\(B ?\$,2%](B ?\$,2%^(B ?\$,2%_(B
+        ?\$,2%`(B ?\$,2%a(B ?\$,2%b(B ?\$,2%c(B ?\$,2%d(B ?\$,2%e(B ?\$,2%f(B ?\$,2%g(B ?\$,2"e(B ?\$,2%i(B ?\$,2%j(B ?\$,2%k(B ?\$,2%l(B ?\$,2%m(B ?\$,2%n(B ?\$,2%o(B
+        ?\$,2%p(B ?\$,2%q(B ?\$,2%r(B ?\$,2%s(B ?\$,2%t(B ?\$,2%u(B ?\$,2%v(B ?\$,2%w(B ?\$,2%x(B ?\$,2%y(B ?\$,2%z(B ?\$,2%{(B ?\$,2%|(B ?\$,2%}(B ?\$,2%~(B ?\$,2%(B
+        ?\$,2& (B ?\$,2&!(B ?\$,2&"(B ?\$,2&#(B ?\$,2&$(B ?\$,2&%(B ?\$,2&&(B ?\$,2&'(B ?\$,2&((B ?\$,2&)(B ?\$,2&*(B ?\$,2&+(B ?\$,2"/(B ?\$,2&-(B ?\$,2!`(B ?\$,2&/(B
+        ?\$,2&0(B ?\$,2&1(B ?\$,2&2(B ?\$,2!r(B ?\$,2!|(B ?\$,2"&(B ?\$,2&6(B ?\$,2"7(B ?\$,2&8(B ?\$,2&9(B ?\$,2&:(B ?\$,2&;(B ?\$,2&<(B ?\$,2&=(B ?\$,2&>(B
+       nil
+       ;; mac-dingbats (128..141) -> emacs-mule mapping
+       ?\$,2&H(B ?\$,2&I(B ?\$,2&J(B ?\$,2&K(B ?\$,2&L(B ?\$,2&M(B ?\$,2&N(B ?\$,2&O(B ?\$,2&P(B ?\$,2&Q(B ?\$,2&R(B ?\$,2&S(B ?\$,2&T(B ?\$,2&U(B]
+       (make-vector (- 161 142) nil)
+       ;; mac-dingbats (161..239) -> emacs-mule mapping
+       [?\$,2&A(B ?\$,2&B(B ?\$,2&C(B ?\$,2&D(B ?\$,2&E(B ?\$,2&F(B ?\$,2&G(B ?\$,2#c(B ?\$,2#f(B ?\$,2#e(B ?\$,2#`(B ?\$,1~@(B ?\$,1~A(B ?\$,1~B(B ?\$,1~C(B
+        ?\$,1~D(B ?\$,1~E(B ?\$,1~F(B ?\$,1~G(B ?\$,1~H(B ?\$,1~I(B ?\$,2&V(B ?\$,2&W(B ?\$,2&X(B ?\$,2&Y(B ?\$,2&Z(B ?\$,2&[(B ?\$,2&\(B ?\$,2&](B ?\$,2&^(B ?\$,2&_(B
+        ?\$,2&`(B ?\$,2&a(B ?\$,2&b(B ?\$,2&c(B ?\$,2&d(B ?\$,2&e(B ?\$,2&f(B ?\$,2&g(B ?\$,2&h(B ?\$,2&i(B ?\$,2&j(B ?\$,2&k(B ?\$,2&l(B ?\$,2&m(B ?\$,2&n(B ?\$,2&o(B
+        ?\$,2&p(B ?\$,2&q(B ?\$,2&r(B ?\$,2&s(B ?\$,2&t(B ?\$,1vr(B ?\$,1vt(B ?\$,1vu(B ?\$,2&x(B ?\$,2&y(B ?\$,2&z(B ?\$,2&{(B ?\$,2&|(B ?\$,2&}(B ?\$,2&~(B ?\$,2&(B
+        ?\$,2' (B ?\$,2'!(B ?\$,2'"(B ?\$,2'#(B ?\$,2'$(B ?\$,2'%(B ?\$,2'&(B ?\$,2''(B ?\$,2'((B ?\$,2')(B ?\$,2'*(B ?\$,2'+(B ?\$,2',(B ?\$,2'-(B ?\$,2'.(B ?\$,2'/(B
+        nil
+       ;; mac-dingbats (241..254) -> emacs-mule mapping
+        ?\$,2'1(B ?\$,2'2(B ?\$,2'3(B ?\$,2'4(B ?\$,2'5(B ?\$,2'6(B ?\$,2'7(B ?\$,2'8(B ?\$,2'9(B ?\$,2':(B ?\$,2';(B ?\$,2'<(B ?\$,2'=(B ?\$,2'>(B
+        nil]))
+     translation-table)
+  (setq translation-table
+        (make-translation-table-from-vector encoding-vector))
+;;  (define-translation-table 'mac-dingbats-decoder translation-table)
+  (define-translation-table 'mac-dingbats-encoder
+    (char-table-extra-slot translation-table 0)))
+
 (defvar mac-font-encoder-list
   '(("mac-roman" mac-roman-encoder
      ccl-encode-mac-roman-font "%s")
     ("mac-centraleurroman" encode-mac-centraleurroman
      ccl-encode-mac-centraleurroman-font "%s ce")
     ("mac-cyrillic" encode-mac-cyrillic
-     ccl-encode-mac-cyrillic-font "%s cy")))
+     ccl-encode-mac-cyrillic-font "%s cy")
+    ("mac-symbol" mac-symbol-encoder
+     ccl-encode-mac-symbol-font "symbol")
+    ("mac-dingbats" mac-dingbats-encoder
+     ccl-encode-mac-dingbats-font "zapf dingbats")))
 
 (let ((encoder-list
        (mapcar (lambda (lst) (nth 1 lst)) mac-font-encoder-list))
@@ -1497,6 +1338,26 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
            (translate-character encode-mac-cyrillic r0 r1)))))
   "CCL program for Mac Cyrillic font")
 
+(define-ccl-program ccl-encode-mac-symbol-font
+  `(0
+    (if (r0 != ,(charset-id 'ascii))
+        (if (r0 <= ?\x8f)
+            (translate-character mac-symbol-encoder r0 r1)
+          ((r1 <<= 7)
+           (r1 |= r2)
+           (translate-character mac-symbol-encoder r0 r1)))))
+  "CCL program for Mac Symbol font")
+
+(define-ccl-program ccl-encode-mac-dingbats-font
+  `(0
+    (if (r0 != ,(charset-id 'ascii))
+        (if (r0 <= ?\x8f)
+            (translate-character mac-dingbats-encoder r0 r1)
+          ((r1 <<= 7)
+           (r1 |= r2)
+           (translate-character mac-dingbats-encoder r0 r1)))))
+  "CCL program for Mac Dingbats font")
+
 
 (setq font-ccl-encoder-alist
       (nconc
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index d70e20e5b6b..054f9c95711 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -145,6 +145,8 @@ only tooltips in the buffer containing the overlay arrow."
   :tag "Use echo area"
   :group 'tooltip)
 
+(defvaralias 'tooltip-use-echo-area 'tooltip-gud-echo-area)
+(make-obsolete-variable 'tooltip-use-echo-area 'tooltip-gud-echo-area "22.1")
 
 ;;; Variables that are not customizable.