diff options
Diffstat (limited to 'lisp/net/webjump.el')
| -rw-r--r-- | lisp/net/webjump.el | 53 |
1 files changed, 22 insertions, 31 deletions
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el index c2c89e17ffb..cff838fca51 100644 --- a/lisp/net/webjump.el +++ b/lisp/net/webjump.el @@ -123,7 +123,7 @@ external browser like IceCat." ;; Misc. general interest. ("National Weather Service" . webjump-to-iwin) ("Usenet FAQs" . - "www.faqs.org/faqs/") + "http://www.faqs.org/faqs/") ("RTFM Usenet FAQs by Group" . "ftp://rtfm.mit.edu/pub/usenet-by-group/") ("RTFM Usenet FAQs by Hierarchy" . @@ -132,7 +132,7 @@ external browser like IceCat." ;; Computer social issues, privacy, professionalism. ("Association for Computing Machinery" . "www.acm.org") - ("Computer Professionals for Social Responsibility" . "www.cpsr.org") + ("Computer Professionals for Social Responsibility" . "http://www.cpsr.org") ("Electronic Frontier Foundation" . "www.eff.org") ("IEEE Computer Society" . "www.computer.org") ("Risks Digest" . webjump-to-risks) @@ -194,7 +194,7 @@ If the symbol of a function is given, then the function will be called with the Web site name (the one you specified in the CAR of the alist cell) as a parameter. This might come in handy for various kludges. -For convenience, if the `http://', `ftp://', or `file://' prefix is missing +For convenience, if the `https://', `ftp://', or `file://' prefix is missing from a URL, WebJump will make a guess at what you wanted and prepend it before submitting the URL." :type '(alist :key-type (string :tag "Name") @@ -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) @@ -380,9 +369,11 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ((string-match "^[a-zA-Z]+:" url) url) ((string-match "^/" url) (concat "file://" url)) ((string-match "^\\([^\\./]+\\)" url) + ;; FIXME: ftp.gnu.org and many others now prefer HTTPS instead + ;; of FTP. Does this heuristic make sense these days? (concat (if (string= (downcase (match-string 1 url)) "ftp") "ftp" - "http") + "https") "://" url)) (t url))))) |