[gnus git] branch master updated: m0-7-132-ge3b69ff =3= Merge branch 'master' of https://git.gnus.org/gnus ; (eww-browse-url): Don't push stuff onto history if there's nothing to push. ; * shr.el (shr-map): Bind [down-mouse-1] to browse URLs.

       via  e3b69ff71348d605c0d8d45dacfe03c87fb01a8d (commit)
       via  d88d85d82a2215860a2d1c0bf3a838e6d66931ff (commit)
       via  1b01398293abd7aa9c3897d4fad97577f6ba2979 (commit)
      from  dc196ee6fc713b91be7b8f83ff53ced7c7aba0e4 (commit)


- Log -----------------------------------------------------------------
commit e3b69ff71348d605c0d8d45dacfe03c87fb01a8d
Merge: d88d85d dc196ee
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Wed Jun 19 15:55:35 2013 +0200

    Merge branch 'master' of https://git.gnus.org/gnus

diff --cc lisp/ChangeLog
index fd7ef21,8c23bba..445ae67
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,10 -1,7 +1,14 @@@
 +2013-06-19  Lars Magne Ingebrigtsen  <[email protected]>
 +
 +	* eww.el (eww-browse-url): Don't push stuff onto history if there's
 +	nothing to push.
 +
 +	* shr.el (shr-map): Bind [down-mouse-1] to browse URLs.
 +
+ 2013-06-19  Glenn Morris  <[email protected]>
+ 
+ 	* gnus-group.el (gnus-mark-article-as-read): Fix declaration.
+ 
  2013-06-18  Teodor Zlatanov  <[email protected]>
  
  	* auth-source.el (auth-source-netrc-parse-entries): Remove debugging.

commit d88d85d82a2215860a2d1c0bf3a838e6d66931ff
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Wed Jun 19 09:31:57 2013 +0200

    (eww-browse-url): Don't push stuff onto history if there's nothing to push.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bca2770..fd7ef21 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-06-19  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* eww.el (eww-browse-url): Don't push stuff onto history if there's
+	nothing to push.
+
 	* shr.el (shr-map): Bind [down-mouse-1] to browse URLs.
 
 2013-06-18  Teodor Zlatanov  <[email protected]>
diff --git a/lisp/eww.el b/lisp/eww.el
index 66180d9..a76cd16 100644
--- a/lisp/eww.el
+++ b/lisp/eww.el
@@ -270,8 +270,10 @@
   (set (make-local-variable 'browse-url-browser-function) 'eww-browse-url))
 
 (defun eww-browse-url (url &optional new-window)
+  (when (and (equal major-mode 'eww-mode)
+	     eww-current-url)
   (push (list eww-current-url (point))
-	eww-history)
+	  eww-history))
   (eww url))
 
 (defun eww-quit ()

commit 1b01398293abd7aa9c3897d4fad97577f6ba2979
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Wed Jun 19 09:04:17 2013 +0200

    * shr.el (shr-map): Bind [down-mouse-1] to browse URLs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cefe450..bca2770 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-19  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* shr.el (shr-map): Bind [down-mouse-1] to browse URLs.
+
 2013-06-18  Teodor Zlatanov  <[email protected]>
 
 	* auth-source.el (auth-source-netrc-parse-entries): Remove debugging.
diff --git a/lisp/shr.el b/lisp/shr.el
index 49fe9c9..b1c8434 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -136,6 +136,7 @@ cid: URL as the argument.")
     (define-key map "z" 'shr-zoom-image)
     (define-key map [tab] 'shr-next-link)
     (define-key map [backtab] 'shr-previous-link)
+    (define-key map [down-mouse-1] 'shr-browse-url)
     (define-key map "I" 'shr-insert-image)
     (define-key map "u" 'shr-copy-url)
     (define-key map "v" 'shr-browse-url)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    7 +++++++
 lisp/eww.el    |    6 ++++--
 lisp/shr.el    |    1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project