From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 30 Jul 2013 14:58:37 +0000 (+0200)
Subject: * net/shr.el (shr-mouse-browse-url): Remove and use `shr-browse-url'.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1688^2~78
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1211de5030608968438ff84d53c7a7a8f016ea9d;p=emacs.git

* net/shr.el (shr-mouse-browse-url): Remove and use `shr-browse-url'.
---

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  <larsi@gnus.org>
 
+	* 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)