2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34e01b40854..b245d602e14 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-09  Kenichi Handa  <handa@m17n.org>
 
+        * international/latin-1.el: Set case and syntax for 255 only if
+        set-case-syntax-set-multibyte is nil.
+
         * textmodes/ispell.el (ispell-insert-word): New function. 
         (ispell-word): Use ispell-insert-word to isnert a new word.
         (ispell-process-line): Likewise
diff --git a/lisp/international/latin-1.el b/lisp/international/latin-1.el
index 3c30ba0721b..610ed1cb9f1 100644
--- a/lisp/international/latin-1.el
+++ b/lisp/international/latin-1.el
@@ -104,7 +104,10 @@
   (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.