(webjump-sample-sites): Fix Lisp archive site.

(webjump): Don't funcall browse-url-browser-function.

diff --git a/lisp/webjump.el b/lisp/webjump.el
index 42d0a4d4f2de0cec6c331500833013942a58a859..22a8c5663719bf3590c3ae6f1018d6f4c1c25c8b 100644 (file)
--- a/lisp/webjump.el
+++ b/lisp/webjump.el
@@ -130,7 +130,7 @@
 
     ;; Emacs.
     ("Emacs Lisp Archive" .
-     "ftp://archive.cis.ohio-state.edu/pub/gnu/emacs/elisp-archive/")
+     "ftp://ftp.cis.ohio-state.edu/pub/gnu/emacs/elisp-archive/")
 
     ;; Internet search engines.
     ("AltaVista" . 
@@ -279,18 +279,18 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
                webjump-sites))
         (name (car item))
         (expr (cdr item)))
-    (funcall browse-url-browser-function
-            (webjump-url-fix
-             (cond ((not expr) "")
-                   ((stringp expr) expr)
-                   ((vectorp expr) (webjump-builtin expr name))
-                   ((listp expr) (eval expr))
-                   ((symbolp expr)
-                    (if (fboundp expr)
-                        (funcall expr name)
-                      (error "WebJump URL function \"%s\" undefined." expr)))
-                   (t (error "WebJump URL expression for \"%s\" invalid."
-                             name)))))))
+    (browse-url (webjump-url-fix
+                (cond ((not expr) "")
+                      ((stringp expr) expr)
+                      ((vectorp expr) (webjump-builtin expr name))
+                      ((listp expr) (eval expr))
+                      ((symbolp expr)
+                       (if (fboundp expr)
+                           (funcall expr name)
+                         (error "WebJump URL function \"%s\" undefined." 
+                                expr)))
+                      (t (error "WebJump URL expression for \"%s\" invalid."
+                                name)))))))
 
 (defun webjump-builtin (expr name)
   (if (< (length expr) 1)