[gnus git] branch master updated: =2= Merge branch 'master' of https://git.gnus.org/gnus ; * gnus-art.el (article-make-date-line): Limit the length a bit more.

       via  2ccb76233859906ab991f8f366bddfc2acb29e49 (commit)
       via  1f993e91f0147f6d3c1397e90db528cd83692211 (commit)
      from  5999faaca088e8ef129ea6b2b7ee7329e3fa57a2 (commit)


- Log -----------------------------------------------------------------
commit 2ccb76233859906ab991f8f366bddfc2acb29e49
Merge: 1f993e9 5999faa
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Jan 27 17:36:14 2011 -0800

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

diff --cc lisp/ChangeLog
index 8f18e72,68a8f80..d27a904
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2011-01-28  Lars Ingebrigtsen  <[email protected]>
 +
 +	* gnus-art.el (article-make-date-line): Limit the length a bit more.
 +
+ 2011-01-28  Daiki Ueno  <[email protected]>
+ 
+ 	* mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Give
+ 	mml2015-signers higher precedence over mml2015-sign-with-sender.
+ 
  2011-01-27  Lars Ingebrigtsen  <[email protected]>
  
  	* gnus-group.el (gnus-group-refresh-group): Refresh even non-visible
diff --cc lisp/gnus-art.el
index 49f3258,2960e8f..bde599c
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@@ -3578,7 -3578,7 +3578,7 @@@ should replace the \"Date:\" one, or sh
  			  (concat " (" (article-lapsed-string time segments) ")"))
  		    (> (+ (length date-string)
  			  (length lapsed-string))
- 		       (+ fill-column 9))
 -		       (+ fill-column 10))
++		       (+ fill-column 6))
  		    (> segments 0))
  	      (setq segments (1- segments)))
  	    (if (> segments 0)
diff --cc texi/ChangeLog
index 0785aef,0785aef..3178115
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@@ -1,3 -1,3 +1,7 @@@
++2011-01-26  Lars Ingebrigtsen  <[email protected]>
++
++	* gnus.texi (Article Date): Document gnus-article-update-lapsed-header.
++
  2011-01-24  Teodor Zlatanov  <[email protected]>
  
  	* message.texi (IDNA): Explain what it is.
diff --cc texi/gnus.texi
index 6c8efaa,6c8efaa..1b65014
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@@ -9503,15 -9503,15 +9503,16 @@@ replace it
  An advantage of using Gnus to read mail is that it converts simple bugs
  into wonderful absurdities.
  
--If you want to have this line updated continually, you can put
++This line is updated continually by default.  If you wish to switch
++that off, say:
  
++@vindex gnus-article-update-lapsed-header
  @lisp
--(gnus-start-date-timer)
++(setq gnus-article-update-lapsed-header nil)
  @end lisp
  
--in your @file{~/.gnus.el} file, or you can run it off of some hook.  If
--you want to stop the timer, you can use the @code{gnus-stop-date-timer}
--command.
++in your @file{~/.gnus.el} file.  If you want to stop the updating
++dynamically, you can use the @code{gnus-stop-date-timer} command.
  
  @item W T o
  @kindex W T o (Summary)

commit 1f993e91f0147f6d3c1397e90db528cd83692211
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Jan 27 16:04:26 2011 -0800

    * gnus-art.el (article-make-date-line): Limit the length a bit more.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 747c9e9..8f18e72 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-28  Lars Ingebrigtsen  <[email protected]>
+
+	* gnus-art.el (article-make-date-line): Limit the length a bit more.
+
 2011-01-27  Lars Ingebrigtsen  <[email protected]>
 
 	* gnus-group.el (gnus-group-refresh-group): Refresh even non-visible
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 2960e8f..49f3258 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3578,7 +3578,7 @@ should replace the \"Date:\" one, or should be added below it."
 			  (concat " (" (article-lapsed-string time segments) ")"))
 		    (> (+ (length date-string)
 			  (length lapsed-string))
-		       (+ fill-column 10))
+		       (+ fill-column 9))
 		    (> segments 0))
 	      (setq segments (1- segments)))
 	    (if (> segments 0)

-----------------------------------------------------------------------
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   |    4 ++++
 lisp/gnus-art.el |    2 +-
 texi/ChangeLog   |    4 ++++
 texi/gnus.texi   |   11 ++++++-----
 4 files changed, 15 insertions(+), 6 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