Mercurial > emacs
diff lisp/disp-table.el @ 26124:ee67b2340a0f
* disp-table.el (standard-display-european): Remove undocumented
arg AUTO; no longer used by startup.el. Do not attempt to treat
all non-English language environments as coding system names.
Instead, use the downcased language environment name as a coding
system name if it is one; otherwise, use latin-1.
author | Paul Eggert <eggert@twinsun.com> |
---|---|
date | Thu, 21 Oct 1999 06:30:07 +0000 |
parents | f581efbf0caf |
children | c8bfb0b55a91 |
line wrap: on
line diff
--- a/lisp/disp-table.el Wed Oct 20 19:34:52 1999 +0000 +++ b/lisp/disp-table.el Thu Oct 21 06:30:07 1999 +0000 @@ -176,7 +176,7 @@ (1- (length glyph-table))) ;;;###autoload -(defun standard-display-european (arg &optional auto) +(defun standard-display-european (arg) "Semi-obsolete way to toggle display of ISO 8859 European characters. This function is semi-obsolete; if you want to do your editing with @@ -199,16 +199,6 @@ those created subsequently). This provides increased compatibility for users who call this function in `.emacs'." - ;; If the optional argument AUTO is non-nil, this function - ;; does not alter `enable-multibyte-characters'. - ;; AUTO also specifies, in this case, the coding system for terminal output. - ;; The AUTO argument is meant for use by startup.el only. - ;; which is why it is not in the doc string. - - ;; AUTO is `lambda' for an interactive call so that it will not - ;; set enable-multibyte-characters but also will not call - ;; set-terminal-coding-system. - (interactive (list current-prefix-arg 'lambda)) (if (or (<= (prefix-numeric-value arg) 0) (and (null arg) (char-table-p standard-display-table) @@ -217,12 +207,12 @@ (progn (standard-display-default 160 255) (unless (or (memq window-system '(x w32)) - (eq auto 'lambda)) + (interactive-p)) (and (terminal-coding-system) (set-terminal-coding-system nil)))) ;; If the user does this explicitly from Lisp (as in .emacs), ;; turn off multibyte chars for more compatibility. - (unless auto + (unless (interactive-p) (setq-default enable-multibyte-characters nil) (mapcar (lambda (buffer) (with-current-buffer buffer @@ -232,20 +222,17 @@ ;; If the user does this explicitly, ;; switch to Latin-1 language environment ;; unless some other has been specified. - (unless auto + (unless (interactive-p) (if (equal current-language-environment "English") (set-language-environment "latin-1"))) (unless (or noninteractive (memq window-system '(x w32)) - (eq auto 'lambda)) - ;; 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. + (interactive-p)) + ;; 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. (set-terminal-coding-system - (cond ((not (equal current-language-environment "English")) - (intern (downcase current-language-environment))) - ((eq auto t) 'latin-1) - ((symbolp auto) (or auto 'latin-1)) - ((stringp auto) (intern auto))))) + (let ((c (intern (downcase current-language-environment)))) + (if (coding-system-p c) c 'latin-1)))) (standard-display-european-internal))) (provide 'disp-table)