summaryrefslogtreecommitdiff
path: root/lisp/disp-table.el
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
commita9984412843095cdbd24e02f61bcfc4bcd3c7ef4 (patch)
treed7a2551d80a4386cf32b657b3844e13b606e9992 /lisp/disp-table.el
parent20848896e467fb5e69bf45fa0e9c12d9bd355c2e (diff)
downloademacs-a9984412843095cdbd24e02f61bcfc4bcd3c7ef4.tar.gz
(standard-display-european): If AUTO is non-nil, intern it.
Don't call set-terminal-coding-system if noninteractive.
Diffstat (limited to 'lisp/disp-table.el')
-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])