* 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.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 58548077d3d64505b684fce2f2b9b7994542ad6f..3719b223b35a9279363ee459dd61d835ea6efefd 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-27  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * eval.texi (Eval): Mention possible recovery from stack overflow.
+
 2014-07-11  Eli Zaretskii  <eliz@gnu.org>
 
        * internals.texi (Garbage Collection): Fix last change.

diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi
index 05250233b00c0a86d0889e2ec7d8f9e50f57f8e2..6ffc7db8abf13867c7d1237ae0bd173cc48983a2 100644 (file)
--- a/doc/lispref/eval.texi
+++ b/doc/lispref/eval.texi
@@ -805,7 +805,12 @@ message @code{"Lisp nesting exceeds max-lisp-eval-depth"}).
 This limit, with the associated error when it is exceeded, is one way
 Emacs Lisp avoids infinite recursion on an ill-defined function.  If
 you increase the value of @code{max-lisp-eval-depth} too much, such
-code can cause stack overflow instead.
+code can cause stack overflow instead.  On some systems, this overflow
+can be handled.  In that case, normal Lisp evaluation is interrupted
+and control is transferred back to the top level command loop
+(@code{top-level}).  Note that there is no way to enter Emacs Lisp
+debugger in this situation.  @xref{Error Debugging}.
+
 @cindex Lisp nesting error
 
 The depth limit counts internal uses of @code{eval}, @code{apply}, and

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e19c757a9501a53d796d6fae27130ec94ee7b5f9..8f23c01de43f1bbb21a7d7c12f599b0330120394 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-27  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * startup.el (normal-top-level): Now use internal--top-level-message.
+
 2014-08-26  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * startup.el (normal-top-level): Use top-level-message.

diff --git a/lisp/startup.el b/lisp/startup.el
index 1d5ae250505b99fc72f5e6cf5c5d6e79db572303..bb55080d67e3f24030d26224022f3e6e760cc942 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -497,7 +497,7 @@ It sets `command-line-processed', processes the command-line,
 reads the initialization files, etc.
 It is the default value of the variable `top-level'."
   (if command-line-processed
-      (message top-level-message)
+      (message internal--top-level-message)
     (setq command-line-processed t)
 
     ;; Look in each dir in load-path for a subdirs.el file.  If we

diff --git a/src/ChangeLog b/src/ChangeLog
index 8bc6c1069ad0367c066f4effc2af3e6719d37c02..33fea805898c746798549b35165011695fe71365 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,10 @@
        (handle_sigsegv): Check whether we really crash somewhere near
        to stack boundary, and handle fatal signal as usual if not.
        (init_sigsegv): Adjust accordingly.
+       * 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.
 
 2014-08-26  Dmitry Antipov  <dmantipov@yandex.ru>
 

diff --git a/src/keyboard.c b/src/keyboard.c
index 79b3aec3304bd118bd02c6d62725e20279e0e602..a8083fa4271c30e4b7abd5cc589fa919ac6bae79 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1153,10 +1153,10 @@ command_loop (void)
     {
       /* Comes here from handle_sigsegv, see sysdep.c.  */
       init_eval ();
-      Vtop_level_message = recover_top_level_message;
+      Vinternal__top_level_message = recover_top_level_message;
     }
   else
-    Vtop_level_message = regular_top_level_message;
+    Vinternal__top_level_message = regular_top_level_message;
 #endif /* HAVE_STACK_OVERFLOW_HANDLING */
   if (command_loop_level > 0 || minibuf_level > 0)
     {
@@ -11029,9 +11029,9 @@ syms_of_keyboard (void)
   recover_top_level_message
     = build_pure_c_string ("Re-entering top level after C stack overflow");
 #endif
-  DEFVAR_LISP ("top-level-message", Vtop_level_message,
+  DEFVAR_LISP ("internal--top-level-message", Vinternal__top_level_message,
               doc: /* Message displayed by `normal-top-level'.  */);
-  Vtop_level_message = regular_top_level_message;
+  Vinternal__top_level_message = regular_top_level_message;
 
   /* Tool-bars.  */
   DEFSYM (QCimage, ":image");