diff options
| author | Dmitry Antipov | 2014-08-27 14:51:21 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-08-27 14:51:21 +0400 |
| commit | 28e0124dd05419689a8a94ec4381e53d4644989c (patch) | |
| tree | 227e2536ea4f4942fb05547d07cd695dc8d7bae8 /src | |
| parent | 7fb78a081b8272034515dcb74e18034f5f71363d (diff) | |
| download | emacs-28e0124dd05419689a8a94ec4381e53d4644989c.tar.gz emacs-28e0124dd05419689a8a94ec4381e53d4644989c.zip | |
* src/keyboard.c (Vtop_level_message): Rename to
Vinternal__top_level_message, as suggested by Stefan Monnier in
http://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00493.html
All related users changed.
* lisp/startup.el (normal-top-level): Now use internal--top-level-message.
* doc/lispref/eval.texi (Eval): Mention possible recovery from stack overflow.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8bc6c1069ad..33fea805898 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -6,6 +6,10 @@ | |||
| 6 | (handle_sigsegv): Check whether we really crash somewhere near | 6 | (handle_sigsegv): Check whether we really crash somewhere near |
| 7 | to stack boundary, and handle fatal signal as usual if not. | 7 | to stack boundary, and handle fatal signal as usual if not. |
| 8 | (init_sigsegv): Adjust accordingly. | 8 | (init_sigsegv): Adjust accordingly. |
| 9 | * keyboard.c (Vtop_level_message): Rename to | ||
| 10 | Vinternal__top_level_message, as suggested by Stefan Monnier in | ||
| 11 | http://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00493.html | ||
| 12 | All related users changed. | ||
| 9 | 13 | ||
| 10 | 2014-08-26 Dmitry Antipov <dmantipov@yandex.ru> | 14 | 2014-08-26 Dmitry Antipov <dmantipov@yandex.ru> |
| 11 | 15 | ||
diff --git a/src/keyboard.c b/src/keyboard.c index 79b3aec3304..a8083fa4271 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1153,10 +1153,10 @@ command_loop (void) | |||
| 1153 | { | 1153 | { |
| 1154 | /* Comes here from handle_sigsegv, see sysdep.c. */ | 1154 | /* Comes here from handle_sigsegv, see sysdep.c. */ |
| 1155 | init_eval (); | 1155 | init_eval (); |
| 1156 | Vtop_level_message = recover_top_level_message; | 1156 | Vinternal__top_level_message = recover_top_level_message; |
| 1157 | } | 1157 | } |
| 1158 | else | 1158 | else |
| 1159 | Vtop_level_message = regular_top_level_message; | 1159 | Vinternal__top_level_message = regular_top_level_message; |
| 1160 | #endif /* HAVE_STACK_OVERFLOW_HANDLING */ | 1160 | #endif /* HAVE_STACK_OVERFLOW_HANDLING */ |
| 1161 | if (command_loop_level > 0 || minibuf_level > 0) | 1161 | if (command_loop_level > 0 || minibuf_level > 0) |
| 1162 | { | 1162 | { |
| @@ -11029,9 +11029,9 @@ syms_of_keyboard (void) | |||
| 11029 | recover_top_level_message | 11029 | recover_top_level_message |
| 11030 | = build_pure_c_string ("Re-entering top level after C stack overflow"); | 11030 | = build_pure_c_string ("Re-entering top level after C stack overflow"); |
| 11031 | #endif | 11031 | #endif |
| 11032 | DEFVAR_LISP ("top-level-message", Vtop_level_message, | 11032 | DEFVAR_LISP ("internal--top-level-message", Vinternal__top_level_message, |
| 11033 | doc: /* Message displayed by `normal-top-level'. */); | 11033 | doc: /* Message displayed by `normal-top-level'. */); |
| 11034 | Vtop_level_message = regular_top_level_message; | 11034 | Vinternal__top_level_message = regular_top_level_message; |
| 11035 | 11035 | ||
| 11036 | /* Tool-bars. */ | 11036 | /* Tool-bars. */ |
| 11037 | DEFSYM (QCimage, ":image"); | 11037 | DEFSYM (QCimage, ":image"); |