summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-09-09 09:16:54 +0000
committerRichard M. Stallman <rms@gnu.org>1997-09-09 09:16:54 +0000
commit9408c20dde0f0bb760a58a8d81ae0812c879955c (patch)
tree208711de0f3ef0cecf29a0d57193007906c719c9
parentc050180edb2bf9e632c8cb699f7c5b82bef8fa28 (diff)
downloademacs-9408c20dde0f0bb760a58a8d81ae0812c879955c.tar.gz
(standard-display-european): If AUTO is non-nil, intern it.
Don't call set-terminal-coding-system if noninteractive.
-rw-r--r--lisp/disp-table.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index bda4802142f..df171e17190 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -204,11 +204,11 @@ AUTO also specifies, in this case, the coding system for terminal output."
(or auto
(setq-default enable-multibyte-characters nil))
(standard-display-8bit 160 255)
- (unless (eq window-system 'x)
+ (unless (or noninteractive (eq window-system 'x))
;; Send those codes literally to a non-X terminal.
;; If AUTO is nil, we are using single-byte characters,
;; so it doesn't matter which one we use.
- (set-terminal-coding-system (or auto 'latin-1)))
+ (set-terminal-coding-system (if auto (intern auto) 'latin-1)))
;; Make non-line-break space display as a plain space.
;; Most X fonts do the wrong thing for code 160.
(aset standard-display-table 160 [32])