]> git.eshelyaron.com Git - emacs.git/commitdiff
Don't --load directories
authorNoam Postavsky <npostavs@gmail.com>
Sun, 21 Aug 2016 14:51:38 +0000 (10:51 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Wed, 7 Sep 2016 23:02:43 +0000 (19:02 -0400)
* 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).

lisp/startup.el

index fcdc376c5ff86af75eb5644f007af94589b6e758..d5225bdcb304f827ea1788fdf8612cfa8f468816 100644 (file)
@@ -2393,7 +2393,7 @@ nil default-directory" name)
                             ;; Take file from default dir if it exists there;
                             ;; otherwise let `load' search for it.
                             (file-ex (expand-file-name file)))
-                       (when (file-exists-p file-ex)
+                       (when (file-regular-p file-ex)
                          (setq file file-ex))
                        (load file nil t)))