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

2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff377e2e85a..db484cfa2b3 100644
--- 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 c56485033a6..73591530668 100644
--- 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)