Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-653
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-654
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656
   Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-662
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-663
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-664
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-665
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-666
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-670
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-671
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-64
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-66
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-67
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-264

1 files changed, 11 insertions, 12 deletions

diff --git a/src/casefiddle.c b/src/casefiddle.c
index 51fc6444f49..ae4888088bd 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -235,6 +235,10 @@ casify_region (flag, b, e)
       else if (!UPPERCASEP (c)
                && (!inword || flag != CASE_CAPITALIZE_UP))
         c = UPCASE1 (c);
+      if (multibyte && c >= 0x80)
+        /* A multibyte result character can't be handled in this
+           simple loop.  */
+        break;
       FETCH_BYTE (i) = c;
       if (c != c2)
         changed = 1;
@@ -272,22 +276,17 @@ casify_region (flag, b, e)
                        tolen = CHAR_STRING (c2, str),
                        fromlen == tolen)
                 {
+                  /* Length is unchanged.  */
                   for (j = 0; j < tolen; ++j)
                     FETCH_BYTE (i + j) = str[j];
                 }
               else
-                {
-                  error ("Can't casify letters that change length");
-#if 0 /* This is approximately what we'd like to be able to do here */
-                  if (tolen < fromlen)
-                    del_range_1 (i + tolen, i + fromlen, 0, 0);
-                  else if (tolen > fromlen)
-                    {
-                      TEMP_SET_PT (i + fromlen);
-                      insert_1 (str + fromlen, tolen - fromlen, 1, 0, 0);
-                    }
-#endif
-                }
+                /* Replace one character with the other,
+                   keeping text properties the same.  */
+                replace_range_2 (start + 1, i + tolen,
+                                 start + 2, i + tolen + fromlen,
+                                 str, 1, tolen,
+                                 0);
             }
           if ((int) flag >= (int) CASE_CAPITALIZE)
             inword = SYNTAX (c2) == Sword;