diff options
| author | Eli Zaretskii | 2014-10-01 17:58:54 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-10-01 17:58:54 +0300 |
| commit | 151b7f6cc269f8d7cf1e104622c66fffa4aa12d1 (patch) | |
| tree | 404ef7e7a68a3750410c900ed6efa27589f15192 | |
| parent | a5bc0a276b54ac9b6636371a2f8692bb6f0c1e7a (diff) | |
| download | emacs-151b7f6cc269f8d7cf1e104622c66fffa4aa12d1.tar.gz emacs-151b7f6cc269f8d7cf1e104622c66fffa4aa12d1.zip | |
Revert the changes in 2014-10-01T02:25:40Z!eggert@cs.ucla.edu.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/dispnew.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 667ac3ce45f..de462841e0d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -21,9 +21,6 @@ | |||
| 21 | All uses changed. | 21 | All uses changed. |
| 22 | * lisp.h (STACK_CONS, AUTO_CONS_EXPR): New internal macros. | 22 | * lisp.h (STACK_CONS, AUTO_CONS_EXPR): New internal macros. |
| 23 | 23 | ||
| 24 | * dispnew.c (adjust_decode_mode_spec_buffer): Prefer ptrdiff_t | ||
| 25 | to ssize_t since we're not using ssize_t-related syscalls here. | ||
| 26 | |||
| 27 | 2014-09-30 Eli Zaretskii <eliz@gnu.org> | 24 | 2014-09-30 Eli Zaretskii <eliz@gnu.org> |
| 28 | 25 | ||
| 29 | * w32fns.c (w32_createwindow): Accept an additional argument, an | 26 | * w32fns.c (w32_createwindow): Accept an additional argument, an |
diff --git a/src/dispnew.c b/src/dispnew.c index 5186c27ec7b..618e5cfd792 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -2137,7 +2137,7 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f) | |||
| 2137 | static void | 2137 | static void |
| 2138 | adjust_decode_mode_spec_buffer (struct frame *f) | 2138 | adjust_decode_mode_spec_buffer (struct frame *f) |
| 2139 | { | 2139 | { |
| 2140 | ptrdiff_t frame_message_buf_size = FRAME_MESSAGE_BUF_SIZE (f); | 2140 | ssize_t frame_message_buf_size = FRAME_MESSAGE_BUF_SIZE (f); |
| 2141 | 2141 | ||
| 2142 | eassert (frame_message_buf_size >= 0); | 2142 | eassert (frame_message_buf_size >= 0); |
| 2143 | f->decode_mode_spec_buffer = xrealloc (f->decode_mode_spec_buffer, | 2143 | f->decode_mode_spec_buffer = xrealloc (f->decode_mode_spec_buffer, |