diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4988363f484..8d55e443f65 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-06-05 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * xdisp.c (single_display_spec_intangible_p): Remove declaration. | ||
| 4 | |||
| 1 | 2011-06-04 Chong Yidong <cyd@stupidchicken.com> | 5 | 2011-06-04 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * xselect.c (x_clipboard_manager_save): Remove redundant arg. | 7 | * xselect.c (x_clipboard_manager_save): Remove redundant arg. |
diff --git a/src/xdisp.c b/src/xdisp.c index 958e7510e1d..02467c7bedd 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -779,7 +779,6 @@ static void store_mode_line_noprop_char (char); | |||
| 779 | static int store_mode_line_noprop (const char *, int, int); | 779 | static int store_mode_line_noprop (const char *, int, int); |
| 780 | static void handle_stop (struct it *); | 780 | static void handle_stop (struct it *); |
| 781 | static void handle_stop_backwards (struct it *, EMACS_INT); | 781 | static void handle_stop_backwards (struct it *, EMACS_INT); |
| 782 | static int single_display_spec_intangible_p (Lisp_Object); | ||
| 783 | static void vmessage (const char *, va_list) ATTRIBUTE_FORMAT_PRINTF (1, 0); | 782 | static void vmessage (const char *, va_list) ATTRIBUTE_FORMAT_PRINTF (1, 0); |
| 784 | static void ensure_echo_area_buffers (void); | 783 | static void ensure_echo_area_buffers (void); |
| 785 | static Lisp_Object unwind_with_echo_area_buffer (Lisp_Object); | 784 | static Lisp_Object unwind_with_echo_area_buffer (Lisp_Object); |