summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-06-11 21:12:29 -0400
committerGlenn Morris <rgm@gnu.org>2015-06-11 21:12:29 -0400
commitb7730b299b0d421ba9789d992f4c8a7df3fde208 (patch)
treedcf9b014fd9861a04c69da3aed77099c96dfc06f /lisp/startup.el
parentabeb7f3c5f5139c393057467cf85ffb8457aff30 (diff)
downloademacs-b7730b299b0d421ba9789d992f4c8a7df3fde208.tar.gz
emacs-b7730b299b0d421ba9789d992f4c8a7df3fde208.tar.bz2
emacs-b7730b299b0d421ba9789d992f4c8a7df3fde208.zip
* lisp/startup.el (normal-top-level): Use delay-warning. (Bug#20792)
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el6
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 370e7aee771..e614466aa23 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -612,11 +612,7 @@ It is the default value of the variable `top-level'."
charset-map-path))))
(if default-directory
(setq default-directory (abbreviate-file-name default-directory))
- ;; FIXME this does not get shown.
- ;; If after (command-line), it is shown, but if command-line
- ;; changed the buffer (eg found a file), it applies to that
- ;; buffer, not *scratch*.
- (display-warning 'initialization "Error setting default-directory"))
+ (delay-warning 'initialization "Error setting default-directory"))
(let ((old-face-font-rescale-alist face-font-rescale-alist))
(unwind-protect
(command-line)