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

[gnu-emacs] / lisp / ffap.el

diff --git a/lisp/ffap.el b/lisp/ffap.el
index 22fef574a6eeb1e42ef680a443f1c7e080d869d0..07ffb0dbd403ad9fe3a0e35245555ca0f468e57e 100644 (file)
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -35,9 +35,8 @@
 ;; README's, MANIFEST's, and so on.  Submit bugs or suggestions with
 ;; M-x ffap-bug.
 ;;
-;; For the default installation, add these two lines to your .emacs file:
+;; For the default installation, add this line to your .emacs file:
 ;;
-;; (require 'ffap)                      ; load the package
 ;; (ffap-bindings)                      ; do default key bindings
 ;;
 ;; ffap-bindings makes the following global key bindings:
@@ -397,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
@@ -549,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))
@@ -1690,13 +1691,14 @@ ffap most of the time."
      ;; (setq dired-x-hands-off-my-keys t) ; the default
      )
      "List of binding forms evaluated by function `ffap-bindings'.
-A reasonable ffap installation needs just these two lines:
-  (require 'ffap)
+A reasonable ffap installation needs just this one line:
   (ffap-bindings)
 Of course if you do not like these bindings, just roll your own!")
 
+;;;###autoload
 (defun ffap-bindings nil
   "Evaluate the forms in variable `ffap-bindings'."
+  (interactive)
   (eval (cons 'progn ffap-bindings)))
 
 \f