Mercurial > emacs

comparison src/casefiddle.c @ 83386:db4e74787e6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Karoly Lorentey <lorentey@elte.hu>
date Wed, 19 Oct 2005 14:06:17 +0000
parents 68d711d80f2f
children 3bd95f4f2941
comparison
equal deleted inserted replaced
83385:1cd4072747c6 83386:db4e74787e6f
90 if (inword && flag != CASE_CAPITALIZE_UP) 90 if (inword && flag != CASE_CAPITALIZE_UP)
91 c = DOWNCASE (c); 91 c = DOWNCASE (c);
92 else if (!UPPERCASEP (c) 92 else if (!UPPERCASEP (c)
93 && (!inword || flag != CASE_CAPITALIZE_UP)) 93 && (!inword || flag != CASE_CAPITALIZE_UP))
94 c = UPCASE1 (c); 94 c = UPCASE1 (c);
95 if (ASCII_BYTE_P (c) || (! multibyte && SINGLE_BYTE_CHAR_P (c))) 95 if ((ASCII_BYTE_P (c) && from_len == 1)
96 || (! multibyte && SINGLE_BYTE_CHAR_P (c)))
96 SSET (obj, i, c); 97 SSET (obj, i, c);
97 else 98 else
98 { 99 {
99 to_len = CHAR_BYTES (c); 100 to_len = CHAR_BYTES (c);
100 if (from_len == to_len) 101 if (from_len == to_len)
101 CHAR_STRING (c, SDATA (obj) + i); 102 CHAR_STRING (c, SDATA (obj) + i);
102 else 103 else
103 Faset (obj, make_number (n), make_number (c)); 104 {
105 Faset (obj, make_number (n), make_number (c));
106 len += to_len - from_len;
107 }
104 } 108 }
105 if ((int) flag >= (int) CASE_CAPITALIZE) 109 if ((int) flag >= (int) CASE_CAPITALIZE)
106 inword = SYNTAX (c) == Sword; 110 inword = SYNTAX (c) == Sword;
107 i += to_len; 111 i += to_len;
108 } 112 }