-;;; disp-table.el --- functions for dealing with char tables.
+;;; disp-table.el --- functions for dealing with char tables
-;; Copyright (C) 1987, 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1994, 1995, 1999 Free Software Foundation, Inc.
;; Author: Erik Naggum <erik@naggum.no>
;; Based on a previous version by Howard Gayle
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
+;;; Commentary:
+
;;; Code:
(put 'display-table 'char-table-extra-slots 6)
(defun standard-display-default (l h)
"Display characters in the range L to H using the default notation."
(while (<= l h)
- (if (and (>= l ?\ ) (< l 127))
- (aset standard-display-table l nil)
- (aset standard-display-table l nil))
+ (if (and (>= l ?\ ) (char-valid-p l))
+ (aset standard-display-table l nil))
(setq l (1+ l))))
;; This function does NOT take terminal-dependent escape sequences.
"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 window-system
+ (if (memq window-system '(x w32))
(error "Cannot use string glyphs in a windowing system"))
(aset standard-display-table c
(vector (create-glyph (concat "\016" (char-to-string sc) "\017")))))
"Display character C as character GC in graphics character set.
This function assumes VT100-compatible escapes; it is meaningless for an
X frame."
- (if window-system
+ (if (memq window-system '(x w32))
(error "Cannot use string glyphs in a windowing system"))
(aset standard-display-table c
(vector (create-glyph (concat "\e(0" (char-to-string gc) "\e(B")))))
;;;###autoload
(defun standard-display-underline (c uc)
"Display character C as character UC plus underlining."
- (if window-system (require 'faces))
(aset standard-display-table c
- (vector
+ (vector
(if window-system
- (logior uc (lsh (face-id (internal-find-face 'underline)) 8))
+ (logior uc (lsh (face-id 'underline) 19))
(create-glyph (concat "\e[4m" (char-to-string uc) "\e[m"))))))
-;; Allocate a glyph code to display by sending STRING to the terminal.
;;;###autoload
(defun create-glyph (string)
+ "Allocate a glyph code to display by sending STRING to the terminal."
(if (= (length glyph-table) 65536)
(error "No free glyph codes remain"))
;; Don't use slots that correspond to ASCII characters.
(1- (length glyph-table)))
;;;###autoload
-(defun standard-display-european (arg &optional auto)
- "Toggle display of European characters encoded with ISO 8859.
-When enabled, characters in the range of 160 to 255 display not
-as octal escapes, but as accented characters.
-With prefix argument, enable European character display iff arg is positive.
-
-Normally, this function turns off `enable-multibyte-characters'
-for all Emacs buffers, because users who call this function
-probably want to edit European characters in single-byte mode.
-
-However, 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."
- (interactive "P")
+(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
+variable, or else customize `enable-multibyte-characters'.
+
+With prefix argument, this command enables European character display
+if arg is positive, disables it otherwise. Otherwise, it toggles
+European character display.
+
+When this mode is enabled, characters in the range of 160 to 255
+display not as octal escapes, but as accented characters. Codes 146
+and 160 display as apostrophe and space, even though they are not the
+ASCII codes for apostrophe and space.
+
+Enabling European character display with this command noninteractively
+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)
(equal (aref standard-display-table 161) [161])))
(progn
(standard-display-default 160 255)
- (unless (eq window-system 'x)
- (set-terminal-coding-system nil)))
- ;; If the user does this explicitly,
- ;; turn off multibyte chars for more compatibility.
- (or auto
- (setq-default enable-multibyte-characters nil))
- (standard-display-8bit 160 255)
- (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 (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])
- ;; Most Windows programs send out apostrophe's as \222. Most X fonts
- ;; don't contain a character at that position. Map it to the ASCII
- ;; apostrophe.
- (aset standard-display-table 146 [39])
- ))
+ (unless (or (memq window-system '(x w32)))
+ (and (terminal-coding-system)
+ (set-terminal-coding-system nil))))
+ ;; Turn off multibyte chars for more compatibility.
+ (setq-default enable-multibyte-characters nil)
+
+ ;; Switch to Latin-1 language environment
+ ;; 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)))
+ ;; 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)
+;;; arch-tag: ffe4c28c-960c-47aa-b8a8-ae89d371ffc7
;;; disp-table.el ends here
HCoop / bpt / emacs.git / blobdiff