mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-25 10:47:00 +00:00
(webjump-sample-sites): Fix Lisp archive site.
(webjump): Don't funcall browse-url-browser-function.
This commit is contained in:
parent
b80f1b20d3
commit
46a3b2b49b
@ -130,7 +130,7 @@
|
|||||||
|
|
||||||
;; Emacs.
|
;; Emacs.
|
||||||
("Emacs Lisp Archive" .
|
("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.
|
;; Internet search engines.
|
||||||
("AltaVista" .
|
("AltaVista" .
|
||||||
@ -279,18 +279,18 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
|
|||||||
webjump-sites))
|
webjump-sites))
|
||||||
(name (car item))
|
(name (car item))
|
||||||
(expr (cdr item)))
|
(expr (cdr item)))
|
||||||
(funcall browse-url-browser-function
|
(browse-url (webjump-url-fix
|
||||||
(webjump-url-fix
|
(cond ((not expr) "")
|
||||||
(cond ((not expr) "")
|
((stringp expr) expr)
|
||||||
((stringp expr) expr)
|
((vectorp expr) (webjump-builtin expr name))
|
||||||
((vectorp expr) (webjump-builtin expr name))
|
((listp expr) (eval expr))
|
||||||
((listp expr) (eval expr))
|
((symbolp expr)
|
||||||
((symbolp expr)
|
(if (fboundp expr)
|
||||||
(if (fboundp expr)
|
(funcall expr name)
|
||||||
(funcall expr name)
|
(error "WebJump URL function \"%s\" undefined."
|
||||||
(error "WebJump URL function \"%s\" undefined." expr)))
|
expr)))
|
||||||
(t (error "WebJump URL expression for \"%s\" invalid."
|
(t (error "WebJump URL expression for \"%s\" invalid."
|
||||||
name)))))))
|
name)))))))
|
||||||
|
|
||||||
(defun webjump-builtin (expr name)
|
(defun webjump-builtin (expr name)
|
||||||
(if (< (length expr) 1)
|
(if (< (length expr) 1)
|
||||||
|
Loading…
Reference in New Issue
Block a user