From edfda78355c5528eee489fa8a7f9c73bf8e734f2 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Tue, 15 Jul 2008 18:15:18 +0000 Subject: merging Emacs.app (NeXTstep port) --- lisp/disp-table.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lisp/disp-table.el') diff --git a/lisp/disp-table.el b/lisp/disp-table.el index 9f7d25d7502..e7ade431181 100644 --- a/lisp/disp-table.el +++ b/lisp/disp-table.el @@ -142,7 +142,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 mac)) + (if (memq window-system '(x w32 mac ns)) (error "Cannot use string glyphs in a windowing system")) (or standard-display-table (setq standard-display-table (make-display-table))) @@ -154,7 +154,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 mac)) + (if (memq window-system '(x w32 mac ns)) (error "Cannot use string glyphs in a windowing system")) (or standard-display-table (setq standard-display-table (make-display-table))) @@ -243,7 +243,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 mac))) + (unless (or (memq window-system '(x w32 mac ns))) (and (terminal-coding-system) (set-terminal-coding-system nil)))) @@ -255,7 +255,7 @@ for users who call this function in `.emacs'." ;; unless some other has been specified. (if (equal current-language-environment "English") (set-language-environment "latin-1")) - (unless (or noninteractive (memq window-system '(x w32 mac))) + (unless (or noninteractive (memq window-system '(x w32 mac ns))) ;; Send those codes literally to a character-based terminal. ;; If we are using single-byte characters, ;; it doesn't matter which coding system we use. -- cgit v1.2.1