From 1211de5030608968438ff84d53c7a7a8f016ea9d Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 30 Jul 2013 16:58:37 +0200 Subject: [PATCH] * net/shr.el (shr-mouse-browse-url): Remove and use `shr-browse-url'. --- lisp/ChangeLog | 2 ++ lisp/net/shr.el | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0c1e7fcb683..d7d3c904226 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-07-30 Lars Magne Ingebrigtsen + * net/shr.el (shr-mouse-browse-url): Remove and use `shr-browse-url'. + * net/eww.el (eww-setup-buffer): Switching to the buffer seems more natural than popping. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index cf3aec21ffb..89791511e09 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -143,7 +143,7 @@ cid: URL as the argument.") (define-key map [tab] 'shr-next-link) (define-key map [backtab] 'shr-previous-link) (define-key map [follow-link] 'mouse-face) - (define-key map [mouse-2] 'shr-mouse-browse-url) + (define-key map [mouse-2] 'shr-browse-url) (define-key map "I" 'shr-insert-image) (define-key map "w" 'shr-copy-url) (define-key map "u" 'shr-copy-url) @@ -664,10 +664,11 @@ size, and full-buffer size." (mouse-set-point ev) (shr-browse-url)) -(defun shr-browse-url (&optional external) +(defun shr-browse-url (&optional external mouse-event) "Browse the URL under point. If EXTERNAL, browse the URL using `shr-external-browser'." - (interactive "P") + (interactive (list current-prefix-arg last-nonmenu-event)) + (mouse-set-point mouse-event) (let ((url (get-text-property (point) 'shr-url))) (cond ((not url) -- 2.39.2