(standard-display-european-internal): Don't fiddle with latin-1 non-break space

any more since it's now special cased in the C code.
Don't "do&undo" setting for 160 (especially, don't undo incorrectly).

2 files changed, 22 insertions, 31 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5247f7cbf..9fb3abb4aa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,18 @@
+2005-01-27  Stefan Monnier  <[email protected]>
+
+	* international/mule-cmds.el (standard-display-european-internal):
+	Don't fiddle with latin-1 non-break space any more since it's now
+	special cased in the C code.
+	Don't "do&undo" setting for 160 (especially, don't undo incorrectly).
+
 2005-01-26  Luc Teirlinck  <[email protected]>
 
 	* cus-start.el (all): Add `undo-outer-limit'.
 
 2005-01-25  Roland Winkler  <[email protected]>
 
-	* textmodes/bibtex.el (bibtex-format-entry): Use
-	`bibtex-empty-field-re' only on the text of fields, not on entire
+	* textmodes/bibtex.el (bibtex-format-entry):
+	Use `bibtex-empty-field-re' only on the text of fields, not on entire
 	field lines.
 	(bibtex-autofill-entry): Use `bibtex-empty-field-re' on a string,
 	not on part of a buffer.
@@ -18,8 +25,7 @@
 	(bibtex-sort-entry-class, bibtex-autokey-titleword-ignore)
 	(bibtex-entry-offset, bibtex-parse-association)
 	(bibtex-parse-field-name): Fix typos in docstrings.
-	(bibtex-field-list, bibtex-find-crossref): Fix typos in error
-	messages.
+	(bibtex-field-list, bibtex-find-crossref): Fix typos in error messages.
 
 2005-01-24  Carsten Dominik <[email protected]>
 
@@ -120,7 +126,7 @@
 
 2005-01-20  Steven Tamm  <[email protected]>
 
-	* term/mac-win.el (process-connection-type): Removed.
+	* term/mac-win.el (process-connection-type): Remove.
 	Controlled now by s/darwin.h:PTY_ITERATION.
 
 2005-01-20  Stefan Monnier  <[email protected]>
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 75b0d5ed22..cf004fe5eb 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1,6 +1,6 @@
 ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*-
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 2003 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
 
@@ -1865,12 +1865,14 @@ specifies the character set for the major languages of Western Europe."
   ;; different there.
   (or (and (eq window-system 'pc) (not default-enable-multibyte-characters))
       (progn
-	;; 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])
-	;; With luck, non-Latin-1 fonts are more recent and so don't
-	;; have this bug.
-	(aset standard-display-table (make-char 'latin-iso8859-1 160) [32])
+	;; Most X fonts used to do the wrong thing for latin-1 code 160.
+	(unless (and (eq window-system 'x)
+		     ;; XFree86 4 has fixed the fonts.
+		     (string= "The XFree86 Project, Inc" (x-server-vendor))
+		     (> (aref (number-to-string (nth 2 (x-server-version))) 0)
+			?3))
+	  ;; Make non-line-break space display as a plain space.
+	  (aset standard-display-table 160 [32]))
 	;; Most Windows programs send out apostrophes as \222.  Most X fonts
 	;; don't contain a character at that position.  Map it to the ASCII
 	;; apostrophe.  [This is actually RIGHT SINGLE QUOTATION MARK,
@@ -1878,23 +1880,7 @@ specifies the character set for the major languages of Western Europe."
 	;; fonts probably have the appropriate glyph at this position,
 	;; so they could use standard-display-8bit.  It's better to use a
 	;; proper windows-1252 coding system.  --fx]
-	(aset standard-display-table 146 [39])
-	;; XFree86 4 has changed most of the fonts from their designed
-	;; versions such that `' no longer appears as balanced quotes.
-	;; Assume it has iso10646 fonts installed, so we can display
-	;; balanced quotes.
-	(when (and (eq window-system 'x)
-		   (string= "The XFree86 Project, Inc" (x-server-vendor))
-		   (> (aref (number-to-string (nth 2 (x-server-version))) 0)
-		      ?3))
-	  ;; We suppress these setting for the moment because the
-	  ;; above assumption is wrong.
-	  ;; (aset standard-display-table ?' [?$,1ry(B])
-	  ;; (aset standard-display-table ?` [?$,1rx(B])
-	  ;; The fonts don't have the relevant bug.
-	  (aset standard-display-table 160 nil)
-	  (aset standard-display-table (make-char 'latin-iso8859-1 160)
-		nil)))))
+	(aset standard-display-table 146 [39]))))
 
 (defun set-language-environment-coding-systems (language-name
 						&optional eol-type)
@@ -1955,8 +1941,7 @@ of `buffer-file-coding-system' set by this function."
       (setq language-name (symbol-name language-name)))
   (dolist (feature (get-language-info language-name 'features))
     (require feature))
-  (let ((doc (get-language-info language-name 'documentation))
-	pos)
+  (let ((doc (get-language-info language-name 'documentation)))
     (help-setup-xref (list #'describe-language-environment language-name)
 		     (interactive-p))
     (with-output-to-temp-buffer (help-buffer)