(Fconstrain_to_field): Make sure we don't violate the

[bpt/emacs.git] / lisp / disp-table.el

diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 193bf5f..f285569 100644 (file)
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -1,6 +1,6 @@
 ;;; 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
@@ -161,7 +161,7 @@ X frame."
   (aset standard-display-table c
        (vector 
         (if window-system
-            (logior uc (lsh (face-id (internal-find-face 'underline)) 8))
+            (logior uc (lsh (face-id (internal-find-face '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.
@@ -176,22 +176,77 @@ X frame."
   (1- (length glyph-table)))
 
 ;;;###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")
+(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
+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 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])))
-      (standard-display-default 160 255)
-    (standard-display-8bit 160 255)
-    ;; 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])))
+      (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)