diff options
| author | Miles Bader <miles@gnu.org> | 2006-01-16 06:59:21 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-01-16 06:59:21 +0000 |
| commit | 6a2bd1a5019d2130c87ac5cf17f1322bf614b624 (patch) | |
| tree | 8e72a4a1b7c177b494ae7721f00ea27b14f9f439 /lisp/disp-table.el | |
| parent | 5bb51be51248803e7400837b83c711854fa86648 (diff) | |
| parent | 292f71fe67394186e943783bef808c611699b63c (diff) | |
| download | emacs-6a2bd1a5019d2130c87ac5cf17f1322bf614b624.tar.gz emacs-6a2bd1a5019d2130c87ac5cf17f1322bf614b624.tar.bz2 emacs-6a2bd1a5019d2130c87ac5cf17f1322bf614b624.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-95
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 598-615)
- Update from CVS
- Remove lisp/toolbar directory
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 142-146)
- Update from CVS
Diffstat (limited to 'lisp/disp-table.el')
| -rw-r--r-- | lisp/disp-table.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/disp-table.el b/lisp/disp-table.el index f7052013bae..4ef992eb0ca 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)))) |