diff options
| author | Lars Magne Ingebrigtsen | 2013-07-30 16:58:37 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2013-07-30 16:58:37 +0200 |
| commit | 1211de5030608968438ff84d53c7a7a8f016ea9d (patch) | |
| tree | 7b66c861a080c7d3f34f7008566196fa81ad6122 | |
| parent | 997798bf652c4f279fc576ec1e0d29c41ae1ea80 (diff) | |
| download | emacs-1211de5030608968438ff84d53c7a7a8f016ea9d.tar.gz emacs-1211de5030608968438ff84d53c7a7a8f016ea9d.zip | |
* net/shr.el (shr-mouse-browse-url): Remove and use `shr-browse-url'.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2013-07-30 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2013-07-30 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * net/shr.el (shr-mouse-browse-url): Remove and use `shr-browse-url'. | ||
| 4 | |||
| 3 | * net/eww.el (eww-setup-buffer): Switching to the buffer seems | 5 | * net/eww.el (eww-setup-buffer): Switching to the buffer seems |
| 4 | more natural than popping. | 6 | more natural than popping. |
| 5 | 7 | ||
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.") | |||
| 143 | (define-key map [tab] 'shr-next-link) | 143 | (define-key map [tab] 'shr-next-link) |
| 144 | (define-key map [backtab] 'shr-previous-link) | 144 | (define-key map [backtab] 'shr-previous-link) |
| 145 | (define-key map [follow-link] 'mouse-face) | 145 | (define-key map [follow-link] 'mouse-face) |
| 146 | (define-key map [mouse-2] 'shr-mouse-browse-url) | 146 | (define-key map [mouse-2] 'shr-browse-url) |
| 147 | (define-key map "I" 'shr-insert-image) | 147 | (define-key map "I" 'shr-insert-image) |
| 148 | (define-key map "w" 'shr-copy-url) | 148 | (define-key map "w" 'shr-copy-url) |
| 149 | (define-key map "u" 'shr-copy-url) | 149 | (define-key map "u" 'shr-copy-url) |
| @@ -664,10 +664,11 @@ size, and full-buffer size." | |||
| 664 | (mouse-set-point ev) | 664 | (mouse-set-point ev) |
| 665 | (shr-browse-url)) | 665 | (shr-browse-url)) |
| 666 | 666 | ||
| 667 | (defun shr-browse-url (&optional external) | 667 | (defun shr-browse-url (&optional external mouse-event) |
| 668 | "Browse the URL under point. | 668 | "Browse the URL under point. |
| 669 | If EXTERNAL, browse the URL using `shr-external-browser'." | 669 | If EXTERNAL, browse the URL using `shr-external-browser'." |
| 670 | (interactive "P") | 670 | (interactive (list current-prefix-arg last-nonmenu-event)) |
| 671 | (mouse-set-point mouse-event) | ||
| 671 | (let ((url (get-text-property (point) 'shr-url))) | 672 | (let ((url (get-text-property (point) 'shr-url))) |
| 672 | (cond | 673 | (cond |
| 673 | ((not url) | 674 | ((not url) |