comparison 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.

26123:a82b8b03185f

      (setq glyph-table (vconcat glyph-table (make-vector 224 nil))))
  (setq glyph-table (vconcat glyph-table (list string)))
  (1- (length glyph-table)))

;;;###autoload
(defun standard-display-european (arg &optional auto)
  "Semi-obsolete way to toggle display of ISO 8859 European characters.

This function is semi-obsolete; if you want to do your editing with
unibyte characters, it is better to `set-language-environment' coupled
with either the `--unibyte' option or the EMACS_UNIBYTE environment

from Lisp code also selects Latin-1 as the language environment, and
selects unibyte mode for all Emacs buffers \(both existing buffers and
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)
	       ;; Test 161, because 160 displays as a space.
	       (equal (aref standard-display-table 161) [161])))
      (progn
	(standard-display-default 160 255)
	(unless (or (memq window-system '(x w32))
		    (eq auto 'lambda))
	  (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
      (setq-default enable-multibyte-characters nil)
      (mapcar (lambda (buffer)
		(with-current-buffer buffer
		  (if enable-multibyte-characters
		      (set-buffer-multibyte nil))))
	      (buffer-list)))
    ;; If the user does this explicitly,
    ;; switch to Latin-1 language environment
    ;; unless some other has been specified.
    (unless auto
      (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.
      (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)))))
    (standard-display-european-internal)))

(provide 'disp-table)

;;; disp-table.el ends here

26124:ee67b2340a0f

      (setq glyph-table (vconcat glyph-table (make-vector 224 nil))))
  (setq glyph-table (vconcat glyph-table (list string)))
  (1- (length glyph-table)))

;;;###autoload
(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
unibyte characters, it is better to `set-language-environment' coupled
with either the `--unibyte' option or the EMACS_UNIBYTE environment

from Lisp code also selects Latin-1 as the language environment, and
selects unibyte mode for all Emacs buffers \(both existing buffers and
those created subsequently).  This provides increased compatibility
for users who call this function in `.emacs'."

  (if (or (<= (prefix-numeric-value arg) 0)
	  (and (null arg)
	       (char-table-p standard-display-table)
	       ;; Test 161, because 160 displays as a space.
	       (equal (aref standard-display-table 161) [161])))
      (progn
	(standard-display-default 160 255)
	(unless (or (memq window-system '(x w32))
		    (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 (interactive-p)
      (setq-default enable-multibyte-characters nil)
      (mapcar (lambda (buffer)
		(with-current-buffer buffer
		  (if enable-multibyte-characters
		      (set-buffer-multibyte nil))))
	      (buffer-list)))
    ;; If the user does this explicitly,
    ;; switch to Latin-1 language environment
    ;; unless some other has been specified.
    (unless (interactive-p)
      (if (equal current-language-environment "English")
	  (set-language-environment "latin-1")))
    (unless (or noninteractive (memq window-system '(x w32))
		(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
       (let ((c (intern (downcase current-language-environment))))
	 (if (coding-system-p c) c 'latin-1))))
    (standard-display-european-internal)))

(provide 'disp-table)

;;; disp-table.el ends here