(dired-get-filename): Don't call file-name-absolute-p with FILE if FILE is nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff377e2e85adc754c4bc0ed49a6e7bc418d1e0a4..db484cfa2b37c5d888bcfd0eeb3c5fbd54a5dd67 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+1999-12-31  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+       * dired.el (dired-get-filename): Don't call file-name-absolute-p
+       with FILE if FILE is nil.
+
+1999-12-30  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+       * simple.el (choose-completion-string): In minibuffer,
+       do not delete the prompt string.
+
 1999-12-30  Gerd Moellmann  <gerd@gnu.org>
 
        * bindings.el (make-mode-line-mouse-sensitive): Copy keymap

diff --git a/lisp/dired.el b/lisp/dired.el
index c56485033a6a60a062152b627e3759ad0d491ad1..7359153066856163f1b4ee126170d7edf540f5ff 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1336,7 +1336,7 @@ Optional arg NO-ERROR-IF-NOT-FILEP means return nil if no filename on
                              "\\([^\\]\\|\\`\\)\"" file "\\1\\\\\"" nil t)
                             file)
                         "\"")))))
-    (and (file-name-absolute-p file)
+    (and file (file-name-absolute-p file)
         (setq already-absolute t))
     (and file buffer-file-coding-system
         (not file-name-coding-system)