aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-08-08 18:30:21 +0000
committerGerd Moellmann2000-08-08 18:30:21 +0000
commitd4021fd9f9d64d7dd9880178065678cee779e4ec (patch)
tree6dea3fe1e6845752f3c87a5e51a7adafca8fbf73
parentdd31e4e8c32c861d61b12c74488b39ef54a9f4c0 (diff)
downloademacs-d4021fd9f9d64d7dd9880178065678cee779e4ec.tar.gz
emacs-d4021fd9f9d64d7dd9880178065678cee779e4ec.zip
(ffap-read-file-or-url-internal): Handle case the
DIR or STRING are nil.
-rw-r--r--lisp/ffap.el4
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."
1216 (t t)))) 1216 (t t))))
1217 1217
1218(defun ffap-read-file-or-url-internal (string dir action) 1218(defun ffap-read-file-or-url-internal (string dir action)
1219 (unless dir
1220 (setq dir default-directory))
1221 (unless string
1222 (setq string default-directory))
1219 (if (ffap-url-p string) 1223 (if (ffap-url-p string)
1220 (ffap-read-url-internal string dir action) 1224 (ffap-read-url-internal string dir action)
1221 (read-file-name-internal string dir action))) 1225 (read-file-name-internal string dir action)))