aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-10-31 13:33:56 +0000
committerGerd Moellmann2001-10-31 13:33:56 +0000
commitfe957e65534a471aaa4e53468283981f8fafa953 (patch)
tree6c37592deeb37f93ec984c25a11355702cc31e87
parentdd387b25cddcdc7437a7abe5fbf3637a92e8d54b (diff)
downloademacs-fe957e65534a471aaa4e53468283981f8fafa953.tar.gz
emacs-fe957e65534a471aaa4e53468283981f8fafa953.zip
(to_multibyte): Fix computation of new read_buffer_size.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/lread.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ba97028618a..fb2b72071d8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12001-10-31 Gerd Moellmann <gerd@gnu.org> 12001-10-31 Gerd Moellmann <gerd@gnu.org>
2 2
3 * lread.c (to_multibyte): Fix computation of new read_buffer_size.
4
3 * xfaces.c (realize_x_face): If C is not a single-byte character, 5 * xfaces.c (realize_x_face): If C is not a single-byte character,
4 set the face's colors_copied_bitwise_p instead of the defaulted_p 6 set the face's colors_copied_bitwise_p instead of the defaulted_p
5 members which have a different meaning. 7 members which have a different meaning.
diff --git a/src/lread.c b/src/lread.c
index 93fe9a9672f..be0ecb64445 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1793,7 +1793,7 @@ to_multibyte (p, end, nchars)
1793 if (read_buffer_size < 2 * nbytes) 1793 if (read_buffer_size < 2 * nbytes)
1794 { 1794 {
1795 int offset = *p - read_buffer; 1795 int offset = *p - read_buffer;
1796 read_buffer_size *= 2; 1796 read_buffer_size = 2 * max (read_buffer_size, nbytes);
1797 read_buffer = (char *) xrealloc (read_buffer, read_buffer_size); 1797 read_buffer = (char *) xrealloc (read_buffer, read_buffer_size);
1798 *p = read_buffer + offset; 1798 *p = read_buffer + offset;
1799 *end = read_buffer + read_buffer_size; 1799 *end = read_buffer + read_buffer_size;