aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-12-07 21:44:19 +0100
committerLars Magne Ingebrigtsen2014-12-07 21:44:19 +0100
commita3ca30c8b5bd53a72590e57d30c0d98a877c8720 (patch)
tree1436edc2fd7579e6fef71cb96341fe1a35768c80
parent06b5cfe498a971503dc7e223e9829d561a3883ac (diff)
downloademacs-a3ca30c8b5bd53a72590e57d30c0d98a877c8720.tar.gz
emacs-a3ca30c8b5bd53a72590e57d30c0d98a877c8720.zip
Revert prefix behavior in RET to previous behavior
* net/eww.el (eww-follow-link): Revert prefix behaviour to previous behavior.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/eww.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1769c486372..188db7f7a5f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-12-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * net/eww.el (eww-follow-link): Revert prefix behaviour to
4 previous behavior.
5
12014-12-07 Ivan Shmakov <ivan@siamics.net> 62014-12-07 Ivan Shmakov <ivan@siamics.net>
2 7
3 * net/eww.el (eww): Moved history recording here... 8 * net/eww.el (eww): Moved history recording here...
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 8b7839701ec..139c0b1372d 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1315,8 +1315,8 @@ The browser to used is specified by the `shr-external-browser' variable."
1315 1315
1316(defun eww-follow-link (&optional external mouse-event) 1316(defun eww-follow-link (&optional external mouse-event)
1317 "Browse the URL under point. 1317 "Browse the URL under point.
1318If EXTERNAL is single prefix, browse in new buffer. 1318If EXTERNAL is single prefix, browse the URL using `shr-external-browser'.
1319If EXTERNAL is double prefix, browse the URL using `shr-external-browser'." 1319If EXTERNAL is double prefix, browse in new buffer."
1320 (interactive (list current-prefix-arg last-nonmenu-event)) 1320 (interactive (list current-prefix-arg last-nonmenu-event))
1321 (mouse-set-point mouse-event) 1321 (mouse-set-point mouse-event)
1322 (let ((url (get-text-property (point) 'shr-url))) 1322 (let ((url (get-text-property (point) 'shr-url)))
@@ -1325,7 +1325,7 @@ If EXTERNAL is double prefix, browse the URL using `shr-external-browser'."
1325 (message "No link under point")) 1325 (message "No link under point"))
1326 ((string-match "^mailto:" url) 1326 ((string-match "^mailto:" url)
1327 (browse-url-mail url)) 1327 (browse-url-mail url))
1328 ((and (consp external) (< 4 (car external))) 1328 ((and (consp external) (<= (car external) 4))
1329 (funcall shr-external-browser url)) 1329 (funcall shr-external-browser url))
1330 ;; This is a #target url in the same page as the current one. 1330 ;; This is a #target url in the same page as the current one.
1331 ((and (url-target (url-generic-parse-url url)) 1331 ((and (url-target (url-generic-parse-url url))