emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] master e5ab4d9 2/2: * lisp/startup.el (command-line-1): In


From: Glenn Morris
Subject: [Emacs-diffs] master e5ab4d9 2/2: * lisp/startup.el (command-line-1): Inform if skipping relative
Date: Sat, 13 Jun 2015 23:42:10 +0000

branch: master
commit e5ab4d92ec404531b5fa9d8fcbce5979a46b220a
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * lisp/startup.el (command-line-1): Inform if skipping relative
    
    file names due to deleted PWD.
---
 lisp/startup.el |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index b389648..ab5a3a4 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)



reply via email to

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