aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-07-26 10:11:43 -0700
committerDan Nicolaescu2010-07-26 10:11:43 -0700
commit977105dcbf011d1ee119aae22a9b0ae85646a686 (patch)
treec0aba9802ac63c09c8c319b23deae2db4f8d62db /src
parentf5ada8903b02e83a49a8846982039c040c3e2d2a (diff)
downloademacs-977105dcbf011d1ee119aae22a9b0ae85646a686.tar.gz
emacs-977105dcbf011d1ee119aae22a9b0ae85646a686.zip
NO_RETURN functions should not return.
* keyboard.c (Ftop_level, Fexit_recursive_edit) (Fabort_recursive_edit): Remove return statements in NO_RETURN functions.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keyboard.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6d812d2de93..9428bd4c0bc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12010-07-26 Dan Nicolaescu <dann@ics.uci.edu> 12010-07-26 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * keyboard.c (Ftop_level, Fexit_recursive_edit)
4 (Fabort_recursive_edit): Remove return statements in NO_RETURN
5 functions.
6
3 * frame.h (Qtty_color_mode): Add declaration. 7 * frame.h (Qtty_color_mode): Add declaration.
4 8
5 * lisp.h (Ftop_level, Fexit_recursive_edit) 9 * lisp.h (Ftop_level, Fexit_recursive_edit)
diff --git a/src/keyboard.c b/src/keyboard.c
index 1cc24f95bdc..7d6ada2c28d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1380,7 +1380,7 @@ This also exits all active minibuffers. */)
1380 while (INPUT_BLOCKED_P) 1380 while (INPUT_BLOCKED_P)
1381 UNBLOCK_INPUT; 1381 UNBLOCK_INPUT;
1382 1382
1383 return Fthrow (Qtop_level, Qnil); 1383 Fthrow (Qtop_level, Qnil);
1384} 1384}
1385 1385
1386DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "", 1386DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "",
@@ -1391,7 +1391,6 @@ DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0,
1391 Fthrow (Qexit, Qnil); 1391 Fthrow (Qexit, Qnil);
1392 1392
1393 error ("No recursive edit is in progress"); 1393 error ("No recursive edit is in progress");
1394 return Qnil;
1395} 1394}
1396 1395
1397DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0, 0, "", 1396DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0, 0, "",
@@ -1402,7 +1401,6 @@ DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0,
1402 Fthrow (Qexit, Qt); 1401 Fthrow (Qexit, Qt);
1403 1402
1404 error ("No recursive edit is in progress"); 1403 error ("No recursive edit is in progress");
1405 return Qnil;
1406} 1404}
1407 1405
1408#if defined (HAVE_MOUSE) || defined (HAVE_GPM) 1406#if defined (HAVE_MOUSE) || defined (HAVE_GPM)