[COMMIT] Correct buffered_bytecount_to_charcount() on non-Mule.
Aidan Kehoe <[email protected]>
| Newsgroups | gmane.emacs.xemacs.patches |
|---|---|
| Message-ID | <[email protected]> |
APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <[email protected]> # Date 1390489396 0 # Node ID 6355de501637068fe0e77e23640d3763708b285f # Parent 7343a186a4757d2053e550dcb9299fd446970487 Correct buffered_bytecount_to_charcount() on non-Mule. src/ChangeLog addition: [...] * text.h (buffered_bytecount_to_charcount): This was declared wrong for non-mule, correct this. Thank you Mats Lidell and the buildbot. diff -r 7343a186a475 -r 6355de501637 src/ChangeLog --- a/src/ChangeLog Thu Jan 23 13:49:40 2014 +0000 +++ b/src/ChangeLog Thu Jan 23 15:03:16 2014 +0000 @@ -1,5 +1,9 @@ 2014-01-23 Aidan Kehoe <[email protected]> + * text.h (buffered_bytecount_to_charcount): This was + declared wrong for non-mule, correct this. Thank you Mats Lidell + and the buildbot. + * lstream.c (Lstream_read_1): Don't include the unread partial character in unget_character_count, since our consumers will never be aware of it. diff -r 7343a186a475 -r 6355de501637 src/text.h --- a/src/text.h Thu Jan 23 13:49:40 2014 +0000 +++ b/src/text.h Thu Jan 23 15:03:16 2014 +0000 @@ -922,7 +922,7 @@ #define charcount_to_bytecount_fmt(ptr, len, fmt) ((Bytecount) (len)) #define skip_ascii(ptr, end) end #define skip_ascii_down(ptr, end) end -#define buffered_bytecount_to_charcount (ptr, len) (len) +#define buffered_bytecount_to_charcount(ptr, len) (len) #endif /* MULE */ -- ‘Liston operated so fast that he once accidentally amputated an assistant’s fingers along with a patient’s leg, […] The patient and the assistant both died of sepsis, and a spectator reportedly died of shock, resulting in the only known procedure with a 300% mortality.’ (Atul Gawande, NEJM, 2012) _______________________________________________ XEmacs-Patches mailing list [email protected] http://lists.xemacs.org/mailman/listinfo/xemacs-patches