Mercurial > emacs
comparison src/coding.c @ 83464:49f9dd4bb117
Merged from
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-32
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-33
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-34
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-35
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-36
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-37
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-8
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-9
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-10
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-11
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-12
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-13
Merge from emacs--devo--0
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-504
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 03 Feb 2006 13:58:41 +0000 |
parents | 76396de7f50a ae0affba29c8 |
children | b98066f4aa10 |
comparison
equal
deleted
inserted
replaced
83463:38c49afb29d9 | 83464:49f9dd4bb117 |
---|---|
866 src += bytes; | 866 src += bytes; |
867 } | 867 } |
868 component[ncomponent] = c; | 868 component[ncomponent] = c; |
869 } | 869 } |
870 } | 870 } |
871 else | 871 else if (c >= 0x80) |
872 { | 872 { |
873 /* This may be an old Emacs 20 style format. See the comment at | 873 /* This may be an old Emacs 20 style format. See the comment at |
874 the section 2 of this file. */ | 874 the section 2 of this file. */ |
875 while (src < src_end && !CHAR_HEAD_P (*src)) src++; | 875 while (src < src_end && !CHAR_HEAD_P (*src)) src++; |
876 if (src == src_end | 876 if (src == src_end |
918 nchars = (ncomponent + 1) / 2; | 918 nchars = (ncomponent + 1) / 2; |
919 } | 919 } |
920 else | 920 else |
921 return 0; | 921 return 0; |
922 } | 922 } |
923 else | |
924 return 0; | |
923 | 925 |
924 if (buf == bufp || dst + (bufp - buf) <= (dst_bytes ? dst_end : src)) | 926 if (buf == bufp || dst + (bufp - buf) <= (dst_bytes ? dst_end : src)) |
925 { | 927 { |
926 CODING_ADD_COMPOSITION_START (coding, coding->produced_char, method); | 928 CODING_ADD_COMPOSITION_START (coding, coding->produced_char, method); |
927 for (i = 0; i < ncomponent; i++) | 929 for (i = 0; i < ncomponent; i++) |