aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorDmitry Antipov2014-08-27 14:51:21 +0400
committerDmitry Antipov2014-08-27 14:51:21 +0400
commit28e0124dd05419689a8a94ec4381e53d4644989c (patch)
tree227e2536ea4f4942fb05547d07cd695dc8d7bae8 /lisp
parent7fb78a081b8272034515dcb74e18034f5f71363d (diff)
downloademacs-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 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/startup.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e19c757a950..8f23c01de43 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-08-27 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * startup.el (normal-top-level): Now use internal--top-level-message.
4
12014-08-26 Dmitry Antipov <dmantipov@yandex.ru> 52014-08-26 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 * startup.el (normal-top-level): Use top-level-message. 7 * startup.el (normal-top-level): Use top-level-message.
diff --git a/lisp/startup.el b/lisp/startup.el
index 1d5ae250505..bb55080d67e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -497,7 +497,7 @@ It sets `command-line-processed', processes the command-line,
497reads the initialization files, etc. 497reads the initialization files, etc.
498It is the default value of the variable `top-level'." 498It is the default value of the variable `top-level'."
499 (if command-line-processed 499 (if command-line-processed
500 (message top-level-message) 500 (message internal--top-level-message)
501 (setq command-line-processed t) 501 (setq command-line-processed t)
502 502
503 ;; Look in each dir in load-path for a subdirs.el file. If we 503 ;; Look in each dir in load-path for a subdirs.el file. If we