diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-06-13 16:41:55 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-06-13 16:41:55 -0700 |
| commit | e5ab4d92ec404531b5fa9d8fcbce5979a46b220a (patch) | |
| tree | e1661f556019b99efadd1d331a6421969e90e786 /lisp/startup.el | |
| parent | 9bdd1c4c90bc19904f63361c32ebd4304f038aaf (diff) | |
| download | emacs-e5ab4d92ec404531b5fa9d8fcbce5979a46b220a.tar.gz emacs-e5ab4d92ec404531b5fa9d8fcbce5979a46b220a.tar.bz2 emacs-e5ab4d92ec404531b5fa9d8fcbce5979a46b220a.zip | |
* lisp/startup.el (command-line-1): Inform if skipping relative
file names due to deleted PWD.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index b389648f678..ab5a3a4bfa5 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -2193,16 +2193,13 @@ A fancy display is used on graphic displays, normal otherwise." ;; to zero when `process-file-arg' returns. (process-file-arg (lambda (name) - ;; If a relative filename was specified and - ;; command-line-default-directory is nil, - ;; silently drop that argument. ;; This can only happen if PWD is deleted. - ;; The warning about setting default-directory will - ;; clue you in. - (when (and (or dir (file-name-absolute-p name)) + (if (not (or dir (file-name-absolute-p name))) + (message "Ignoring relative file name (%s) due to \ +nil default-directory" name) (let* ((file (expand-file-name - (command-line-normalize-file-name name) - dir)) + (command-line-normalize-file-name name) + dir)) (buf (find-file-noselect file))) (setq displayable-buffers (cons buf displayable-buffers)) (with-current-buffer buf @@ -2212,7 +2209,7 @@ A fancy display is used on graphic displays, normal otherwise." (setq line 0) (unless (< column 1) (move-to-column (1- column))) - (setq column 0)))))))) + (setq column 0))))))) ;; Add the long X options to longopts. (dolist (tem command-line-x-option-alist) |