summaryrefslogtreecommitdiff
path: root/lisp/disp-table.el
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2005-10-21 08:26:54 +0000
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2005-10-21 08:26:54 +0000
commit06b4a81bb402dac279a389ce8adae48db16b6db8 (patch)
treeb8aa81fb7875403e2581b765c4f86855b354201d /lisp/disp-table.el
parent1505621c908eeaa166a7b4a19d0053a17c7f5d73 (diff)
downloademacs-06b4a81bb402dac279a389ce8adae48db16b6db8.tar.gz
(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.
Diffstat (limited to 'lisp/disp-table.el')
-rw-r--r--lisp/disp-table.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 778ea092e43..3c862bcc421 100644
--- 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))))