diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lisp.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3e750aed54b..8d01797b63c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-07-26 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * lisp.h (Ftop_level, Fexit_recursive_edit) | ||
| 4 | (Fabort_recursive_edit): Mark as NO_RETURN. | ||
| 5 | |||
| 1 | 2010-07-26 Kenichi Handa <handa@m17n.org> | 6 | 2010-07-26 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the | 8 | * font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the |
diff --git a/src/lisp.h b/src/lisp.h index 6b5de400c06..85f271fa193 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -3155,7 +3155,9 @@ extern Lisp_Object Vthrow_on_input; | |||
| 3155 | extern int input_pending; | 3155 | extern int input_pending; |
| 3156 | EXFUN (Fdiscard_input, 0); | 3156 | EXFUN (Fdiscard_input, 0); |
| 3157 | EXFUN (Frecursive_edit, 0); | 3157 | EXFUN (Frecursive_edit, 0); |
| 3158 | EXFUN (Ftop_level, 0); | 3158 | EXFUN (Ftop_level, 0) NO_RETURN; |
| 3159 | EXFUN (Fexit_recursive_edit, 0) NO_RETURN; | ||
| 3160 | EXFUN (Fabort_recursive_edit, 0) NO_RETURN; | ||
| 3159 | EXFUN (Fcommand_execute, 4); | 3161 | EXFUN (Fcommand_execute, 4); |
| 3160 | EXFUN (Finput_pending_p, 0); | 3162 | EXFUN (Finput_pending_p, 0); |
| 3161 | extern Lisp_Object menu_bar_items (Lisp_Object); | 3163 | extern Lisp_Object menu_bar_items (Lisp_Object); |