1 files changed, 4 insertions, 0 deletions

diff --git a/lisp/ffap.el b/lisp/ffap.el
index 37ce6679457..22fef574a6e 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1216,6 +1216,10 @@ which may actually result in an url rather than a filename."
      (t t))))
 
 (defun ffap-read-file-or-url-internal (string dir action)
+  (unless dir
+    (setq dir default-directory))
+  (unless string
+    (setq string default-directory))
   (if (ffap-url-p string)
       (ffap-read-url-internal string dir action)
     (read-file-name-internal string dir action)))