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

Conflicts:
	lisp/ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f18e72..d27a904 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,11 @@
 
        * 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 --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 49f3258..bde599c 100644 (file)
--- 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 9))
+                      (+ fill-column 6))
                    (> segments 0))
              (setq segments (1- segments)))
            (if (> segments 0)

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index eb01c92..1271168 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -116,7 +116,8 @@ Whether the passphrase is cached at all is controlled by
   :type 'integer)
 
 (defcustom mml2015-signers nil
-  "A list of your own key ID which will be used to sign a message."
+  "A list of your own key ID which will be used to sign a message.
+If set, it overrides the setting of `mml2015-sign-with-sender'."
   :group 'mime-security
   :type '(repeat (string :tag "Key ID")))
 
@@ -965,8 +966,10 @@ Whether the passphrase is cached at all is controlled by
   (let* ((inhibit-redisplay t)
         (context (epg-make-context))
         (boundary (mml-compute-boundary cont))
-        (sender (when mml2015-sign-with-sender
-                   message-options-get 'message-sender))
+        (sender (message-options-get 'message-sender))
+        (signer-names (or mml2015-signers
+                          (if (and mml2015-sign-with-sender sender)
+                              (list (concat "<" sender ">")))))
         signer-key
         (signers
          (or (message-options-get 'mml2015-epg-signers)
@@ -976,10 +979,7 @@ Whether the passphrase is cached at all is controlled by
                   (epa-select-keys context "\
 Select keys for signing.
 If no one is selected, default secret key is used.  "
-                                   (if sender
-                                       (cons (concat "<" sender ">")
-                                             mml2015-signers)
-                                     mml2015-signers)
+                                   signer-names
                                    t)
                 (if (or sender mml2015-signers)
                     (delq nil
@@ -995,10 +995,7 @@ If no one is selected, default secret key is used.  "
                                            signer)))
                                (error "No secret key for %s" signer))
                              signer-key)
-                           (if sender
-                               (cons (concat "<" sender ">")
-                                     mml2015-signers)
-                             mml2015-signers))))))))
+                           signer-names)))))))
         signature micalg)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
@@ -1038,15 +1035,18 @@ If no one is selected, default secret key is used.  "
     (goto-char (point-max))))
 
 (defun mml2015-epg-encrypt (cont &optional sign)
-  (let ((inhibit-redisplay t)
-       (context (epg-make-context))
-       (config (epg-configuration))
-       (sender (when mml2015-sign-with-sender
-                  (message-options-get 'message-sender)))
-       (recipients (message-options-get 'mml2015-epg-recipients))
-       cipher signers
-       (boundary (mml-compute-boundary cont))
-       recipient-key signer-key)
+  (let* ((inhibit-redisplay t)
+        (context (epg-make-context))
+        (boundary (mml-compute-boundary cont))
+        (config (epg-configuration))
+        (recipients (message-options-get 'mml2015-epg-recipients))
+        cipher
+        (sender (message-options-get 'message-sender))
+        (signer-names (or mml2015-signers
+                          (if (and mml2015-sign-with-sender sender)
+                              (list (concat "<" sender ">")))))
+        signers
+        recipient-key signer-key)
     (unless recipients
       (setq recipients
            (apply #'nconc
@@ -1060,12 +1060,9 @@ If no one is selected, default secret key is used.  "
                                              (read-string "Recipients: ")))
                     "[ \f\t\n\r\v,]+"))))
       (when mml2015-encrypt-to-self
-       (unless (or sender mml2015-signers)
-         (error "Message sender and mml2015-signers not set"))
-       (setq recipients (nconc recipients (if sender
-                                              (cons (concat "<" sender ">")
-                                                    mml2015-signers)
-                                            mml2015-signers))))
+       (unless signer-names
+         (error "Neither message sender nor mml2015-signers are set"))
+       (setq recipients (nconc recipients signer-names)))
       (if (eq mm-encrypt-option 'guided)
          (setq recipients
                (epa-select-keys context "\
@@ -1098,10 +1095,7 @@ If no one is selected, symmetric encryption will be performed.  "
                     (epa-select-keys context "\
 Select keys for signing.
 If no one is selected, default secret key is used.  "
-                                     (if sender
-                                         (cons (concat "<" sender ">")
-                                               mml2015-signers)
-                                       mml2015-signers)
+                                     signer-names
                                      t)
                   (if (or sender mml2015-signers)
                       (delq nil
@@ -1117,9 +1111,7 @@ If no one is selected, default secret key is used.  "
                                              signer)))
                                  (error "No secret key for %s" signer))
                                signer-key)
-                             (if sender
-                                 (cons (concat "<" sender ">") mml2015-signers)
-                               mml2015-signers))))))))
+                             signer-names)))))))
       (epg-context-set-signers context signers))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 0785aef..3178115 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -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 --git a/texi/gnus.texi b/texi/gnus.texi
index 6c8efaa..1b65014 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -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)