emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/backports-25.2 9e9f7c8 45/46: Don't --load directo


From: Noam Postavsky
Subject: [Emacs-diffs] scratch/backports-25.2 9e9f7c8 45/46: Don't --load directories
Date: Sun, 2 Oct 2016 14:04:50 +0000 (UTC)

branch: scratch/backports-25.2
commit 9e9f7c8638ccbe407f6cd5bc231d0d28aa9faf5e
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>

    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).
    
    (cherry picked from commit a08ce41ed8e9fd8768dcd1ecd22ff6bc4c4c7f8f)
---
 lisp/startup.el |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index 761e69e..ebd5505 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2386,7 +2386,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)))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]