aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoam Postavsky2016-08-21 10:51:38 -0400
committerNoam Postavsky2016-09-07 19:02:43 -0400
commita08ce41ed8e9fd8768dcd1ecd22ff6bc4c4c7f8f (patch)
tree1ce48ed6d794647a0c6ced5292c8dd1323426cbb
parent55dde6c1a21a792d3d75c19e612c74dd054aaf1e (diff)
downloademacs-a08ce41ed8e9fd8768dcd1ecd22ff6bc4c4c7f8f.tar.gz
emacs-a08ce41ed8e9fd8768dcd1ecd22ff6bc4c4c7f8f.zip
Don't --load directories
* lisp/startup.el (command-line-1): Only pass expanded FILENAME argument of --load when it refers to a normal file, since `load' doesn't handle directories (Bug #16406).
-rw-r--r--lisp/startup.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index fcdc376c5ff..d5225bdcb30 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2393,7 +2393,7 @@ nil default-directory" name)
2393 ;; Take file from default dir if it exists there; 2393 ;; Take file from default dir if it exists there;
2394 ;; otherwise let `load' search for it. 2394 ;; otherwise let `load' search for it.
2395 (file-ex (expand-file-name file))) 2395 (file-ex (expand-file-name file)))
2396 (when (file-exists-p file-ex) 2396 (when (file-regular-p file-ex)
2397 (setq file file-ex)) 2397 (setq file file-ex))
2398 (load file nil t))) 2398 (load file nil t)))
2399 2399