(standard-display-g1, standard-display-graphic): Refuse to use string

glyphs also on Mac.
(standard-display-european): Don't set terminal coding system also
on Mac.

diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 778ea092e43df2fe74ac36b6e53fc0ed64ed5297..3c862bcc421063ed7f37972536733b67a37317bc 100644 (file)
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -145,7 +145,7 @@ Valid symbols are `truncation', `wrap', `escape', `control',
   "Display character C as character SC in the g1 character set.
 This function assumes that your terminal uses the SO/SI characters;
 it is meaningless for an X frame."
-  (if (memq window-system '(x w32))
+  (if (memq window-system '(x w32 mac))
       (error "Cannot use string glyphs in a windowing system"))
   (or standard-display-table
       (setq standard-display-table (make-display-table)))
@@ -157,7 +157,7 @@ it is meaningless for an X frame."
   "Display character C as character GC in graphics character set.
 This function assumes VT100-compatible escapes; it is meaningless for an
 X frame."
-  (if (memq window-system '(x w32))
+  (if (memq window-system '(x w32 mac))
       (error "Cannot use string glyphs in a windowing system"))
   (or standard-display-table
       (setq standard-display-table (make-display-table)))
@@ -217,7 +217,7 @@ for users who call this function in `.emacs'."
               (equal (aref standard-display-table 161) [161])))
       (progn
        (standard-display-default 160 255)
-       (unless (or (memq window-system '(x w32)))
+       (unless (or (memq window-system '(x w32 mac)))
          (and (terminal-coding-system)
               (set-terminal-coding-system nil))))