[gnus git] branch master updated: m0-5-201-gbdfcd72 =4= Indent. ; Merge branch 'master' of https://git.gnus.org/gnus ; Doc typo fix. ; (gnus-backend-trace): Also not the elapsed seconds.

       via  bdfcd724f043d9ee8fb9dedb95a224197653ca41 (commit)
       via  b81275df268c28a57b94f58417cfce61d36baf4c (commit)
       via  881b86d2bc0aa5e8b32eeb2b07ab165ed467ec7e (commit)
       via  87df10134f1063ca660403ba81d85e058bcc50e3 (commit)
      from  1db42d895431c82232a567bda94a058a9c38ddf0 (commit)


- Log -----------------------------------------------------------------
commit bdfcd724f043d9ee8fb9dedb95a224197653ca41
Author: Lars Ingebrigtsen <[email protected]>
Date:   Mon Dec 24 13:23:38 2012 +0100

    Indent.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ffc28ac..6750121 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -404,6 +404,7 @@
 	Change (random t) to (random), now that the latter is more random.
 
 2012-08-31  Dave Abrahams  <[email protected]>
+
 	* nnimap.el (nnimap-change-group): Document result value
 
 	* auth-source.el (auth-sources): Fix macos keychain access.
@@ -420,8 +421,8 @@
 	* gnus-registry.el (gnus-try-warping-via-registry): Don't act as though
 	you've found the article when you haven't.
 
-	* nnimap.el (nnimap-find-article-by-message-id): Account for the fact that
-	nnimap-change-group can return t
+	* nnimap.el (nnimap-find-article-by-message-id): Account for the fact
+	that nnimap-change-group can return t.
 
 2012-08-31  Stefan Monnier  <[email protected]>
 

commit b81275df268c28a57b94f58417cfce61d36baf4c
Merge: 881b86d 1db42d8
Author: Lars Ingebrigtsen <[email protected]>
Date:   Sun Dec 23 19:46:03 2012 +0100

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

diff --cc lisp/ChangeLog
index cc900f0,955fc17..ffc28ac
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,12 -1,15 +1,18 @@@
 +2012-12-23  Lars Ingebrigtsen  <[email protected]>
 +
+ 2012-12-23  Andreas Schwab  <[email protected]>
+ 
+ 	* shr.el (shr-tag-em): Render em as italic, not bold.
+ 
+ 2012-12-23  Lars Ingebrigtsen  <[email protected]>
+ 
  	* gnus-int.el (gnus-backend-trace): Factor out into its own function
  	for reuse.
  	(gnus-open-server): Use it to add more tracing.
  	(gnus-finish-retrieve-group-infos): Add backend tracing.
 +	(gnus-backend-trace): Also note the elapsed seconds.
  
- 2012-12-22  Philipp Haselwarter <[email protected]>
+ 2012-12-22  Philipp Haselwarter  <[email protected]>
  
  	* gnus-sync.el (gnus-sync-file-encrypt-to, gnus-sync-save): Set
  	epa-file-encrypt-to from variable to avoid querying.

commit 881b86d2bc0aa5e8b32eeb2b07ab165ed467ec7e
Author: Lars Ingebrigtsen <[email protected]>
Date:   Sun Dec 23 15:44:17 2012 +0100

    Doc typo fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a91b08..cc900f0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,7 +4,7 @@
 	for reuse.
 	(gnus-open-server): Use it to add more tracing.
 	(gnus-finish-retrieve-group-infos): Add backend tracing.
-	(gnus-backend-trace): Also not the elapsed seconds.
+	(gnus-backend-trace): Also note the elapsed seconds.
 
 2012-12-22  Philipp Haselwarter <[email protected]>
 

commit 87df10134f1063ca660403ba81d85e058bcc50e3
Author: Lars Ingebrigtsen <[email protected]>
Date:   Sun Dec 23 15:44:06 2012 +0100

    (gnus-backend-trace): Also not the elapsed seconds.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24aa9e9..5a91b08 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,7 @@
 	for reuse.
 	(gnus-open-server): Use it to add more tracing.
 	(gnus-finish-retrieve-group-infos): Add backend tracing.
+	(gnus-backend-trace): Also not the elapsed seconds.
 
 2012-12-22  Philipp Haselwarter <[email protected]>
 
diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index b692299..ea887b2 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -254,7 +254,12 @@ If it is down, start it up (again)."
     (buffer-disable-undo)
       (goto-char (point-max))
       (insert (format-time-string "%H:%M:%S")
-	      (format " %s %S\n" type form))))
+	    (format " %.2fs %s %S\n"
+		    (if (numberp gnus-backend-trace)
+			(- (float-time) gnus-backend-trace)
+		      0)
+		    type form))
+    (setq gnus-backend-trace (float-time))))
 
 (defun gnus-open-server (gnus-command-method)
   "Open a connection to GNUS-COMMAND-METHOD."

-----------------------------------------------------------------------
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   |    8 ++++++--
 lisp/gnus-int.el |   11 ++++++++---
 2 files changed, 14 insertions(+), 5 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