mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Reduce code duplication in webjump

Browse source 
* lisp/net/webjump.el (webjump): Simplify.
This commit is contained in:
Stefan Kangas 2023-10-25 09:25:39 +02:00
parent e3da8edf5e
commit 71c366ba02
1 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

45
lisp/net/webjump.el
View file

@ -1,6 +1,6 @@
;;; webjump.el --- programmable Web hotlist -*- lexical-binding: t; -*-
;; Copyright (C) 1996-1997, 2001-2023 Free Software Foundation, Inc.
;; Copyright (C) 1996-2023 Free Software Foundation, Inc.
;; Author: Neil W. Van Dyke <nwv@acm.org>
;; Maintainer: emacs-devel@gnu.org
@ -262,33 +262,22 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
(completing-read "WebJump to site: " webjump-sites nil t)
webjump-sites t))
(name (car item))
(expr (cdr item)))
(if webjump-use-internal-browser
(browse-url-with-browser-kind
'internal (webjump-url-fix
(cond ((not expr) "")
((stringp expr) expr)
((vectorp expr) (webjump-builtin expr name))
((listp expr) (eval expr t))
((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 t))
((symbolp expr)
(if (fboundp expr)
(funcall expr name)
(error "WebJump URL function \"%s\" undefined"
expr)))
(t (error "WebJump URL expression for \"%s\" invalid"
name))))))))
(expr (cdr item))
(fun (if webjump-use-internal-browser
(apply-partially #'browse-url-with-browser-kind 'internal)
#'browse-url)))
(funcall fun (webjump-url-fix
(cond ((not expr) "")
((stringp expr) expr)
((vectorp expr) (webjump-builtin expr name))
((listp expr) (eval expr t))
((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)