diff options
| -rw-r--r-- | lisp/webjump.el | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lisp/webjump.el b/lisp/webjump.el index 42d0a4d4f2d..22a8c566371 100644 --- a/lisp/webjump.el +++ b/lisp/webjump.el | |||
| @@ -130,7 +130,7 @@ | |||
| 130 | 130 | ||
| 131 | ;; Emacs. | 131 | ;; Emacs. |
| 132 | ("Emacs Lisp Archive" . | 132 | ("Emacs Lisp Archive" . |
| 133 | "ftp://archive.cis.ohio-state.edu/pub/gnu/emacs/elisp-archive/") | 133 | "ftp://ftp.cis.ohio-state.edu/pub/gnu/emacs/elisp-archive/") |
| 134 | 134 | ||
| 135 | ;; Internet search engines. | 135 | ;; Internet search engines. |
| 136 | ("AltaVista" . | 136 | ("AltaVista" . |
| @@ -279,18 +279,18 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke | |||
| 279 | webjump-sites)) | 279 | webjump-sites)) |
| 280 | (name (car item)) | 280 | (name (car item)) |
| 281 | (expr (cdr item))) | 281 | (expr (cdr item))) |
| 282 | (funcall browse-url-browser-function | 282 | (browse-url (webjump-url-fix |
| 283 | (webjump-url-fix | 283 | (cond ((not expr) "") |
| 284 | (cond ((not expr) "") | 284 | ((stringp expr) expr) |
| 285 | ((stringp expr) expr) | 285 | ((vectorp expr) (webjump-builtin expr name)) |
| 286 | ((vectorp expr) (webjump-builtin expr name)) | 286 | ((listp expr) (eval expr)) |
| 287 | ((listp expr) (eval expr)) | 287 | ((symbolp expr) |
| 288 | ((symbolp expr) | 288 | (if (fboundp expr) |
| 289 | (if (fboundp expr) | 289 | (funcall expr name) |
| 290 | (funcall expr name) | 290 | (error "WebJump URL function \"%s\" undefined." |
| 291 | (error "WebJump URL function \"%s\" undefined." expr))) | 291 | expr))) |
| 292 | (t (error "WebJump URL expression for \"%s\" invalid." | 292 | (t (error "WebJump URL expression for \"%s\" invalid." |
| 293 | name))))))) | 293 | name))))))) |
| 294 | 294 | ||
| 295 | (defun webjump-builtin (expr name) | 295 | (defun webjump-builtin (expr name) |
| 296 | (if (< (length expr) 1) | 296 | (if (< (length expr) 1) |