From 08fdede61348f8c3cecc8d3b6506157df7c38843 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 13 Dec 2004 18:56:52 +0000 Subject: (QUIT): Check for Vthrow_on_input. (Vthrow_on_input): Declare it. --- src/lisp.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/lisp.h') diff --git a/src/lisp.h b/src/lisp.h index 3a7ebfac381..3dddd6179b2 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1768,11 +1768,15 @@ extern char *stack_bottom; #ifdef SYNC_INPUT extern void handle_async_input P_ ((void)); extern int interrupt_input_pending; + #define QUIT \ do { \ if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) \ { \ + Lisp_Object flag = Vquit_flag; \ Vquit_flag = Qnil; \ + if (EQ (Vthrow_on_input, flag)) \ + Fthrow (Vthrow_on_input, Qnil); \ Fsignal (Qquit, Qnil); \ } \ else if (interrupt_input_pending) \ @@ -1785,7 +1789,10 @@ extern int interrupt_input_pending; do { \ if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) \ { \ + Lisp_Object flag = Vquit_flag; \ Vquit_flag = Qnil; \ + if (EQ (Vthrow_on_input, flag)) \ + Fthrow (Vthrow_on_input, Qnil); \ Fsignal (Qquit, Qnil); \ } \ } while (0) @@ -2876,6 +2883,7 @@ extern struct kboard *echo_kboard; extern void cancel_echoing P_ ((void)); extern Lisp_Object Qdisabled, QCfilter; extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level; +extern Lisp_Object Vthrow_on_input; extern int input_pending; EXFUN (Fdiscard_input, 0); EXFUN (Frecursive_edit, 0); -- cgit v1.2.3 From f10fffca3fb90b39d12f806a1038b12c5b610c84 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 21 Dec 2004 11:32:07 +0000 Subject: (truncate_undo_list): Update decl. --- src/lisp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lisp.h') diff --git a/src/lisp.h b/src/lisp.h index 3dddd6179b2..754356689d9 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3049,7 +3049,7 @@ extern void syms_of_macros P_ ((void)); /* defined in undo.c */ extern Lisp_Object Qinhibit_read_only; EXFUN (Fundo_boundary, 0); -extern Lisp_Object truncate_undo_list P_ ((Lisp_Object, int, int, int)); +extern void truncate_undo_list P_ ((struct buffer *)); extern void record_marker_adjustment P_ ((Lisp_Object, int)); extern void record_insert P_ ((int, int)); extern void record_delete P_ ((int, Lisp_Object)); -- cgit v1.2.3 From 8e43e4b2f912fe94566a6d78a087d679bee5627d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 23 Dec 2004 00:15:49 +0000 Subject: (Vundo_outer_limit): Fix decl. --- src/lisp.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/lisp.h') diff --git a/src/lisp.h b/src/lisp.h index 754356689d9..8081e7c4fe4 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3058,6 +3058,7 @@ extern void record_change P_ ((int, int)); extern void record_property_change P_ ((int, int, Lisp_Object, Lisp_Object, Lisp_Object)); extern void syms_of_undo P_ ((void)); +extern Lisp_Object Vundo_outer_limit; /* defined in textprop.c */ extern Lisp_Object Qfont, Qmouse_face; -- cgit v1.2.3