diff options
| author | Katsumi Yamaoka | 2015-02-10 07:55:14 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2015-02-10 07:55:14 +0000 |
| commit | 2dacd0a7eee1f8fdff028e15ff40640d005c71d7 (patch) | |
| tree | bd17dba88215113e7564f7ab044272f0a9be4d81 /src/lisp.h | |
| parent | b88908b6f0775e4275fdad2c80ea0199d277a947 (diff) | |
| parent | f6d781c29456590dfb10e1710171e8d983eeb9e2 (diff) | |
| download | emacs-2dacd0a7eee1f8fdff028e15ff40640d005c71d7.tar.gz emacs-2dacd0a7eee1f8fdff028e15ff40640d005c71d7.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lisp.h b/src/lisp.h index f5242ab84a1..6c7b51fea06 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -3640,7 +3640,7 @@ extern bool noninteractive_need_newline; | |||
| 3640 | extern Lisp_Object echo_area_buffer[2]; | 3640 | extern Lisp_Object echo_area_buffer[2]; |
| 3641 | extern void add_to_log (const char *, Lisp_Object, Lisp_Object); | 3641 | extern void add_to_log (const char *, Lisp_Object, Lisp_Object); |
| 3642 | extern void check_message_stack (void); | 3642 | extern void check_message_stack (void); |
| 3643 | extern void setup_echo_area_for_printing (int); | 3643 | extern void setup_echo_area_for_printing (bool); |
| 3644 | extern bool push_message (void); | 3644 | extern bool push_message (void); |
| 3645 | extern void pop_message_unwind (void); | 3645 | extern void pop_message_unwind (void); |
| 3646 | extern Lisp_Object restore_message_unwind (Lisp_Object); | 3646 | extern Lisp_Object restore_message_unwind (Lisp_Object); |
| @@ -3653,7 +3653,7 @@ extern void message1_nolog (const char *); | |||
| 3653 | extern void message3 (Lisp_Object); | 3653 | extern void message3 (Lisp_Object); |
| 3654 | extern void message3_nolog (Lisp_Object); | 3654 | extern void message3_nolog (Lisp_Object); |
| 3655 | extern void message_dolog (const char *, ptrdiff_t, bool, bool); | 3655 | extern void message_dolog (const char *, ptrdiff_t, bool, bool); |
| 3656 | extern void message_with_string (const char *, Lisp_Object, int); | 3656 | extern void message_with_string (const char *, Lisp_Object, bool); |
| 3657 | extern void message_log_maybe_newline (void); | 3657 | extern void message_log_maybe_newline (void); |
| 3658 | extern void update_echo_area (void); | 3658 | extern void update_echo_area (void); |
| 3659 | extern void truncate_echo_area (ptrdiff_t); | 3659 | extern void truncate_echo_area (ptrdiff_t); |
| @@ -3663,8 +3663,8 @@ void set_frame_cursor_types (struct frame *, Lisp_Object); | |||
| 3663 | extern void syms_of_xdisp (void); | 3663 | extern void syms_of_xdisp (void); |
| 3664 | extern void init_xdisp (void); | 3664 | extern void init_xdisp (void); |
| 3665 | extern Lisp_Object safe_eval (Lisp_Object); | 3665 | extern Lisp_Object safe_eval (Lisp_Object); |
| 3666 | extern int pos_visible_p (struct window *, ptrdiff_t, int *, | 3666 | extern bool pos_visible_p (struct window *, ptrdiff_t, int *, |
| 3667 | int *, int *, int *, int *, int *); | 3667 | int *, int *, int *, int *, int *); |
| 3668 | 3668 | ||
| 3669 | /* Defined in xsettings.c. */ | 3669 | /* Defined in xsettings.c. */ |
| 3670 | extern void syms_of_xsettings (void); | 3670 | extern void syms_of_xsettings (void); |