[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a08ce41 3/3: Don't --load directories
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master a08ce41 3/3: Don't --load directories |
Date: |
Wed, 7 Sep 2016 23:26:58 +0000 (UTC) |
branch: master
commit a08ce41ed8e9fd8768dcd1ecd22ff6bc4c4c7f8f
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).
---
lisp/startup.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/startup.el b/lisp/startup.el
index fcdc376..d5225bd 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -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)))