Merge from emacs--rel--22

[gnu-emacs] / lisp / international / latin-1.el

diff --git a/lisp/international/latin-1.el b/lisp/international/latin-1.el
index 3c30ba0721bd97b14df04c704cc5e64d509e4b1f..4c3125655508a51568a6848efc8fecee48a066ad 100644 (file)
--- a/lisp/international/latin-1.el
+++ b/lisp/international/latin-1.el
@@ -1,6 +1,7 @@
 ;;; latin-1.el --- set up case-conversion and syntax tables for ISO Latin-1
 
-;; Copyright (C) 1988,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
@@ -20,8 +21,8 @@
 
 ;; 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, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -40,7 +41,9 @@
        (if set-case-syntax-set-multibyte
           (- (make-char 'latin-iso8859-1) 128)
         0)))
-  (set-case-syntax 160 " " tbl)                ;no-break space
+  ;; NBSP isn't semantically interchangeable with other whitespace chars,
+  ;; so it's more like punctation.
+  (set-case-syntax 160 "." tbl)                ;no-break space
   (set-case-syntax 161 "." tbl)                ;inverted exclamation mark
   (set-case-syntax 162 "w" tbl)                ;cent sign
   (set-case-syntax 163 "w" tbl)                ;pound sign
@@ -104,18 +107,21 @@
   (set-case-syntax-pair 222 254 tbl)   ;latin letter thorn (Icelandic)
   (set-case-syntax 223 "w" tbl)                ;latin small letter sharp s (German)
   (set-case-syntax 247 "_" tbl)                ;division sign
-  (set-case-syntax 255 "w" tbl))       ;latin small letter y with diaeresis
+  ;; The following setting should be suppressed when we are loading
+  ;; this file for setting syntax of multibyte characters.
+  (or set-case-syntax-set-multibyte
+      (set-case-syntax 255 "w" tbl)))  ;latin small letter y with diaeresis
 
 ;; When preloading this file, don't provide the feature.
 ;; Explicit `require' is used to load this for 8-bit characters.
 (or set-case-syntax-set-multibyte
     (provide 'latin-1))
 
-;;; Don't compile this file: src/Makefile.in instructs make-docfile
-;;; to look at the .el file!
-;;; Local Variables:
-;;; no-byte-compile: t
-;;; End:
+;; Don't compile this file: src/Makefile.in instructs make-docfile
+;; to look at the .el file!
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
 
-;;; arch-tag: c2ee6895-edc3-40b2-9518-8c09f1d56c54
+;; arch-tag: c2ee6895-edc3-40b2-9518-8c09f1d56c54
 ;;; latin-1.el ends here