diff options
| -rw-r--r-- | admin/ChangeLog | 6 | ||||
| -rw-r--r-- | admin/nt/README.W32 | 6 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/coding.c | 6 |
4 files changed, 15 insertions, 7 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index af28f372509..0d9ff5bb3a4 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,9 @@ +2012-02-06 Christoph Scholtes <cschol2112@googlemail.com> + + * nt/README.W32: Backported fixed url for image libraries from + trunk. Removed explicit reference to version of libXpm included in + binary distributions for maintenance purposes. + 2012-01-19 Chong Yidong <cyd@gnu.org> * Version 23.4 released. diff --git a/admin/nt/README.W32 b/admin/nt/README.W32 index efc6aca7485..010fe454023 100644 --- a/admin/nt/README.W32 +++ b/admin/nt/README.W32 @@ -114,13 +114,11 @@ See the end of the file for license conditions. Emacs has built in support for XBM and PPM/PGM/PBM images, and the libXpm library is bundled, providing XPM support (required for color toolbar icons and splash screen). Source for libXpm should be available - on the same place as you got this binary distribution from. The version - of libXpm bundled with this version of Emacs is 3.5.7, based on x.org's - libXpm library from X11R7.3. + on the same place as you got this binary distribution from. Emacs can also support some other image formats with appropriate libraries. These libraries are all available as part of GTK - download for Windows (http://www.gtk.org/download-windows.html), or + download for Windows (http://www.gtk.org/download/win32.php), or from the GnuWin32 project. Emacs will find them if the directory they are installed in is on the PATH. diff --git a/src/ChangeLog b/src/ChangeLog index 8e20731bc3a..aad0730ddd7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-02-08 Kenichi Handa <handa@m17n.org> + + * coding.c (produce_chars): Fix updating of src_end (Bug#10701). + 2012-01-25 Chong Yidong <cyd@gnu.org> * Version 23.4 released. diff --git a/src/coding.c b/src/coding.c index 8e96db1f521..c0393e76253 100644 --- a/src/coding.c +++ b/src/coding.c @@ -7038,7 +7038,7 @@ produce_chars (coding, translation_table, last_block) dst_end = coding->destination + coding->dst_bytes; coding_set_source (coding); src = coding->source + offset; - src_end = coding->source + coding->src_bytes; + src_end = coding->source + coding->consumed; if (EQ (coding->src_object, coding->dst_object)) dst_end = (unsigned char *) src; } @@ -7072,7 +7072,7 @@ produce_chars (coding, translation_table, last_block) dst_end = coding->destination + coding->dst_bytes; coding_set_source (coding); src = coding->source + offset; - src_end = coding->source + coding->src_bytes; + src_end = coding->source + coding->consumed; if (EQ (coding->src_object, coding->dst_object)) dst_end = (unsigned char *) src; } @@ -7093,7 +7093,7 @@ produce_chars (coding, translation_table, last_block) dst = alloc_destination (coding, require, dst); coding_set_source (coding); src = coding->source + offset; - src_end = coding->source + coding->src_bytes; + src_end = coding->source + coding->consumed; } } produced_chars = coding->consumed_char; |