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

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index 8f18e72,68a8f80..d27a904
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2011-01-28  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus-art.el (article-make-date-line): Limit the length a bit more.
 +
+ 2011-01-28  Daiki Ueno  <ueno@unixuser.org>
+ 
+       * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Give
+       mml2015-signers higher precedence over mml2015-sign-with-sender.
+ 
  2011-01-27  Lars Ingebrigtsen  <larsi@gnus.org>
  
        * gnus-group.el (gnus-group-refresh-group): Refresh even non-visible

diff --cc lisp/gnus-art.el
index 49f3258,2960e8f..bde599c
--- 1/lisp/gnus-art.el
--- 2/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
--- 1/texi/ChangeLog
--- 2/texi/ChangeLog
+++ b/texi/ChangeLog
@@@ -1,3 -1,3 +1,7 @@@
++2011-01-26  Lars Ingebrigtsen  <larsi@gnus.org>
++
++      * gnus.texi (Article Date): Document gnus-article-update-lapsed-header.
++
  2011-01-24  Teodor Zlatanov  <tzz@lifelogs.com>
  
        * message.texi (IDNA): Explain what it is.

diff --cc texi/gnus.texi
index 6c8efaa,6c8efaa..1b65014
--- 1/texi/gnus.texi
--- 2/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)