diff options
| author | Phillip Lord | 2015-11-12 22:01:22 +0000 |
|---|---|---|
| committer | Phillip Lord | 2015-11-12 22:01:22 +0000 |
| commit | 20aa42e8204f8f0139ba3880cb32ddf88acc9bf4 (patch) | |
| tree | f77644c920b0f6a5a2f5849a064c6828c17530b1 /src/lisp.h | |
| parent | d2f73db50bec29724cb1324910350ad24420b174 (diff) | |
| parent | 44dfa86b7d382b84564d68472da1448d08f48129 (diff) | |
| download | emacs-20aa42e8204f8f0139ba3880cb32ddf88acc9bf4.tar.gz emacs-20aa42e8204f8f0139ba3880cb32ddf88acc9bf4.zip | |
; Merge branch 'fix/no-undo-boundary-on-secondary-buffer-change'
Conflicts:
src/cmds.c
src/keyboard.c
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h index c782f0dd003..3efa492e0e8 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -4008,7 +4008,6 @@ extern void syms_of_casetab (void); | |||
| 4008 | extern Lisp_Object echo_message_buffer; | 4008 | extern Lisp_Object echo_message_buffer; |
| 4009 | extern struct kboard *echo_kboard; | 4009 | extern struct kboard *echo_kboard; |
| 4010 | extern void cancel_echoing (void); | 4010 | extern void cancel_echoing (void); |
| 4011 | extern Lisp_Object last_undo_boundary; | ||
| 4012 | extern bool input_pending; | 4011 | extern bool input_pending; |
| 4013 | #ifdef HAVE_STACK_OVERFLOW_HANDLING | 4012 | #ifdef HAVE_STACK_OVERFLOW_HANDLING |
| 4014 | extern sigjmp_buf return_to_command_loop; | 4013 | extern sigjmp_buf return_to_command_loop; |