From 977105dcbf011d1ee119aae22a9b0ae85646a686 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 26 Jul 2010 10:11:43 -0700 Subject: [PATCH] NO_RETURN functions should not return. * keyboard.c (Ftop_level, Fexit_recursive_edit) (Fabort_recursive_edit): Remove return statements in NO_RETURN functions. --- src/ChangeLog | 4 ++++ src/keyboard.c | 4 +--- 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 @@ 2010-07-26 Dan Nicolaescu + * keyboard.c (Ftop_level, Fexit_recursive_edit) + (Fabort_recursive_edit): Remove return statements in NO_RETURN + functions. + * frame.h (Qtty_color_mode): Add declaration. * 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. */) while (INPUT_BLOCKED_P) UNBLOCK_INPUT; - return Fthrow (Qtop_level, Qnil); + Fthrow (Qtop_level, Qnil); } DEFUN ("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, Fthrow (Qexit, Qnil); error ("No recursive edit is in progress"); - return Qnil; } DEFUN ("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, Fthrow (Qexit, Qt); error ("No recursive edit is in progress"); - return Qnil; } #if defined (HAVE_MOUSE) || defined (HAVE_GPM) -- 2.39.2