[Emacs-diffs] trunk r113602: * net/shr.el (shr-mouse-browse-url): Remove and use `shr-browse-url'.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113602
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-30 16:58:37 +0200
message:
  * net/shr.el (shr-mouse-browse-url): Remove and use `shr-browse-url'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-30 14:31:51 +0000
+++ b/lisp/ChangeLog    2013-07-30 14:58:37 +0000
@@ -1,5 +1,7 @@
 2013-07-30  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2013-07-30 14:27:04 +0000
+++ b/lisp/net/shr.el   2013-07-30 14:58:37 +0000
@@ -143,7 +143,7 @@
     (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 @@
   (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)