(dired-view-command-alist): New variable.

[gnu-emacs] / lisp / ffap.el

diff --git a/lisp/ffap.el b/lisp/ffap.el
index 648688813d62901e2fc01212e7fa27ac93769f45..07ffb0dbd403ad9fe3a0e35245555ca0f468e57e 100644 (file)
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -396,6 +396,7 @@ Returned values:
       (cond
        ((eq strategy 'accept) 'accept)
        ((eq strategy 'reject) nil)
+       ((not (fboundp 'open-network-stream)) nil)
        ;; assume (eq strategy 'ping)
        (t
        (or quiet
@@ -548,7 +549,8 @@ Looks at `ffap-ftp-default-user', returns \"\" for \"localhost\"."
           (progn
             ;; errs: htb symbol may be unbound, or not a hash-table.
             ;; gnus-gethash is just a macro for intern-soft.
-            (and (intern-soft string (symbol-value htb))
+            (and (symbol-value htb)
+                 (intern-soft string (symbol-value htb))
                  (setq ret string htbs nil))
             ;; If we made it this far, gnus is running, so ignore "heads":
             (setq heads nil))