Merged from miles@gnu.org--gnu-2005 (patch 133-141, 596-609)

Patches applied:

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-606
   Remove lisp/toolbar directory

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-133
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-134
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-135
   Update from CVS

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-137
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-138
   Update from CVS: texi/gnus.texi (RSS): Fix key description.

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-140
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-141
   Update from CVS: texi/gnus.texi (Document Server Internals): Addition.

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

1 files changed, 6 insertions, 2 deletions

diff --git a/src/casefiddle.c b/src/casefiddle.c
index 454d184b99b..dee68fcf8c0 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -92,7 +92,8 @@ casify_object (flag, obj)
               else if (!UPPERCASEP (c)
                        && (!inword || flag != CASE_CAPITALIZE_UP))
                 c = UPCASE1 (c);
-              if (ASCII_BYTE_P (c) || (! multibyte && SINGLE_BYTE_CHAR_P (c)))
+              if ((ASCII_BYTE_P (c) && from_len == 1)
+                  || (! multibyte && SINGLE_BYTE_CHAR_P (c)))
                 SSET (obj, i, c);
               else
                 {
@@ -100,7 +101,10 @@ casify_object (flag, obj)
                   if (from_len == to_len)
                     CHAR_STRING (c, SDATA (obj) + i);
                   else
-                    Faset (obj, make_number (n), make_number (c));
+                    {
+                      Faset (obj, make_number (n), make_number (c));
+                      len += to_len - from_len;
+                    }
                 }
               if ((int) flag >= (int) CASE_CAPITALIZE)
                 inword = SYNTAX (c) == Sword;