;;; 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
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Code:
-(defconst display-table-extras 6
- "The number of extra slots in a display table.")
+(put 'display-table 'char-table-extra-slots 6)
;;;###autoload
(defun make-display-table ()
"Return a new, empty display table."
- (make-char-table display-table-extras nil))
+ (make-char-table 'display-table nil))
(or standard-display-table
(setq standard-display-table (make-display-table)))
-(defconst display-table-slot-name-alist
- '((truncation 0 display-table-char-p)
- (wrap 1 display-table-char-p)
- (escape 2 display-table-char-p)
- (control 3 display-table-char-p)
- (selective-display 4 display-table-vector-p)
- (vertical-border 5 display-table-char-p))
- "Association list of display-table slot names.
-Each element contains the slot name, slot number, and a predicate
-function to test the validity of values for the setter function.")
-
-(defun display-table-char-p (c)
- "Test whether c is a valid character for display-tables."
- (and (integerp c) (<= 0 c) (<= c 256)))
-
-(defun display-table-vector-p (cv)
- "Test whether CV is a valid character vector for display-tables."
- (and (vectorp cv)
- ;; (every 'display-table-char-p cv)
- (let ((i (1- (length cv))))
- (while (and (<= 0 i) (display-table-char-p (aref cv i)))
- (setq i (1- i)))
- (> 0 i))))
+;;; Display-table slot names. The property value says which slot.
+
+(put 'truncation 'display-table-slot 0)
+(put 'wrap 'display-table-slot 1)
+(put 'escape 'display-table-slot 2)
+(put 'control 'display-table-slot 3)
+(put 'selective-display 'display-table-slot 4)
+(put 'vertical-border 'display-table-slot 5)
;;;###autoload
(defun display-table-slot (display-table slot)
"Return the value of the extra slot in DISPLAY-TABLE named SLOT.
-SLOT may be a number from 0 to 5 inclusive, or a name (symbol).
-See `display-table-slot-name-alist' for the names and numbers."
+SLOT may be a number from 0 to 5 inclusive, or a slot name (symbol).
+Valid symbols are `truncation', `wrap', `escape', `control',
+`selective-display', and `vertical-border'."
(let ((slot-number
(if (numberp slot) slot
- (or (car (cdr (assoc slot display-table-slot-name-alist)))
+ (or (get slot 'display-table-slot)
(error "Invalid display-table slot name: %s" slot)))))
(char-table-extra-slot display-table slot-number)))
(defun set-display-table-slot (display-table slot value)
"Set the value of the extra slot in DISPLAY-TABLE named SLOT to VALUE.
SLOT may be a number from 0 to 5 inclusive, or a name (symbol).
-See `display-table-slot-name-alist' for the names and numbers."
- (let* ((slot-entry
- (or (if (numberp slot)
- (cdr (nth slot display-table-slot-name-alist))
- (cdr (assoc slot display-table-slot-name-alist)))
- (error "Invalid display-table slot: %s" slot)))
- (slot-number (car slot-entry))
- (slot-predicate (car (cdr slot-entry))))
- (if (funcall slot-predicate value)
- (set-char-table-extra-slot display-table slot-number value)
- (signal 'wrong-type-argument (list slot-predicate value)))))
+Valid symbols are `truncation', `wrap', `escape', `control',
+`selective-display', and `vertical-border'."
+ (let ((slot-number
+ (if (numberp slot) slot
+ (or (get slot 'display-table-slot)
+ (error "Invalid display-table slot name: %s" slot)))))
+ (set-char-table-extra-slot display-table slot-number value)))
;;;###autoload
(defun describe-display-table (dt)
"Describe the display table DT in a help buffer."
(with-output-to-temp-buffer "*Help*"
(princ "\nTruncation glyph: ")
- (prin1 (char-table-extra-slot dt 0)) ;direct access is faster
+ (prin1 (display-table-slot dt 'truncation))
(princ "\nWrap glyph: ")
- (prin1 (char-table-extra-slot dt 1))
+ (prin1 (display-table-slot dt 'wrap))
(princ "\nEscape glyph: ")
- (prin1 (char-table-extra-slot dt 2))
+ (prin1 (display-table-slot dt 'escape))
(princ "\nCtrl glyph: ")
- (prin1 (char-table-extra-slot dt 3))
+ (prin1 (display-table-slot dt 'control))
(princ "\nSelective display glyph sequence: ")
- (prin1 (char-table-extra-slot dt 4))
+ (prin1 (display-table-slot dt 'selective-display))
(princ "\nVertical window border glyph: ")
- (prin1 (char-table-extra-slot dt 5))
+ (prin1 (display-table-slot dt 'vertical-border))
(princ "\nCharacter display glyph sequences:\n")
(save-excursion
(set-buffer standard-output)
"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
(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.
;;;###autoload
(defun standard-display-european (arg)
- "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."
- (interactive "P")
+ "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 160) [160])))
- (standard-display-default 160 255)
- (standard-display-8bit 160 255)))
+ ;; 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)