aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-03-14 08:25:21 -0700
committerPaul Eggert2011-03-14 08:25:21 -0700
commit3ac946723de017fa8d2cf55510b3f0ff931f1237 (patch)
tree086a9ac99ca12a95abd6e88ea7d51080f6e5db0a
parent560a553af5dacb11317afda073344fdbe17fdf17 (diff)
downloademacs-3ac946723de017fa8d2cf55510b3f0ff931f1237.tar.gz
emacs-3ac946723de017fa8d2cf55510b3f0ff931f1237.zip
* keyboard.c (Fexit_recursive_edit, Fabort_recursive_edit): Mark with NO_RETURN.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/keyboard.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c4b4b4b5494..1cdeefff899 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,6 +9,7 @@
9 (parse_tool_bar_item, read_key_sequence, Fread_key_sequence): 9 (parse_tool_bar_item, read_key_sequence, Fread_key_sequence):
10 (Fread_key_sequence_vector): Rename locals to avoid shadowing. 10 (Fread_key_sequence_vector): Rename locals to avoid shadowing.
11 (read_key_sequence): Mark locals as initialized. 11 (read_key_sequence): Mark locals as initialized.
12 (Fexit_recursive_edit, Fabort_recursive_edit): Mark with NO_RETURN.
12 13
13 * keyboard.h (make_ctrl_char): New decl. 14 * keyboard.h (make_ctrl_char): New decl.
14 (mark_kboards): Move decl here ... 15 (mark_kboards): Move decl here ...
diff --git a/src/keyboard.c b/src/keyboard.c
index 5680f32502c..afa78184179 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1169,6 +1169,7 @@ This also exits all active minibuffers. */)
1169 Fthrow (Qtop_level, Qnil); 1169 Fthrow (Qtop_level, Qnil);
1170} 1170}
1171 1171
1172Lisp_Object Fexit_recursive_edit (void) NO_RETURN;
1172DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "", 1173DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "",
1173 doc: /* Exit from the innermost recursive edit or minibuffer. */) 1174 doc: /* Exit from the innermost recursive edit or minibuffer. */)
1174 (void) 1175 (void)
@@ -1179,6 +1180,7 @@ DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0,
1179 error ("No recursive edit is in progress"); 1180 error ("No recursive edit is in progress");
1180} 1181}
1181 1182
1183Lisp_Object Fabort_recursive_edit (void) NO_RETURN;
1182DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0, 0, "", 1184DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0, 0, "",
1183 doc: /* Abort the command that requested this recursive edit or minibuffer input. */) 1185 doc: /* Abort the command that requested this recursive edit or minibuffer input. */)
1184 (void) 1186 (void)