[gnus git] branch master updated: m0-13-116-gaa25148 =1= Revert changes causing old Emacsen not to work

       via  aa25148e72f3da5bdf4cbafb59165229f965ce23 (commit)
      from  41ae6ab8c74cb388999ed5411ac4c5823e1aa230 (commit)


- Log -----------------------------------------------------------------
commit aa25148e72f3da5bdf4cbafb59165229f965ce23
Author: Katsumi Yamaoka <[email protected]>
Date:   Fri Jan 22 04:03:19 2016 +0000

    Revert changes causing old Emacsen not to work
    
    * mml-sec.el (mml1991-signers, mml2015-signers)
    (mml-smime-signers, mml1991-encrypt-to-self, mml2015-encrypt-to-self)
    (mml-smime-encrypt-to-self, mml2015-sign-with-sender)
    (mml-smime-sign-with-sender, mml2015-always-trust)
    (mml-secure-fail-when-key-problem, mml-secure-key-preferences):
    * nntp.el (nntp-request-newgroups): Revert.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44c45f4..67cd71f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2016-01-22  Katsumi Yamaoka  <[email protected]>
+
+	Revert changes causing old Emacsen not to work
+
+	* mml-sec.el (mml1991-signers, mml2015-signers)
+	(mml-smime-signers, mml1991-encrypt-to-self, mml2015-encrypt-to-self)
+	(mml-smime-encrypt-to-self, mml2015-sign-with-sender)
+	(mml-smime-sign-with-sender, mml2015-always-trust)
+	(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
+	* nntp.el (nntp-request-newgroups): Revert.
+
 2016-01-19  Katsumi Yamaoka  <[email protected]>
 
 	* nnir.el (nnir-request-update-mark): Default to the original mark.
diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index 48e6384..0e4c551 100644
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -432,18 +432,15 @@ If called with a prefix argument, only encrypt (do NOT sign)."
 
 ;;; Common functionality for mml1991.el, mml2015.el, mml-smime.el
 
-(define-obsolete-variable-alias 'mml1991-signers 'mml-secure-openpgp-signers
-  "25.1")
-(define-obsolete-variable-alias 'mml2015-signers 'mml-secure-openpgp-signers
-  "25.1")
+(define-obsolete-variable-alias 'mml1991-signers 'mml-secure-openpgp-signers)
+(define-obsolete-variable-alias 'mml2015-signers 'mml-secure-openpgp-signers)
 (defcustom mml-secure-openpgp-signers nil
   "A list of your own key ID(s) which will be used to sign OpenPGP messages.
 If set, it is added to the setting of `mml-secure-openpgp-sign-with-sender'."
   :group 'mime-security
   :type '(repeat (string :tag "Key ID")))
 
-(define-obsolete-variable-alias 'mml-smime-signers 'mml-secure-smime-signers
-  "25.1")
+(define-obsolete-variable-alias 'mml-smime-signers 'mml-secure-smime-signers)
 (defcustom mml-secure-smime-signers nil
   "A list of your own key ID(s) which will be used to sign S/MIME messages.
 If set, it is added to the setting of `mml-secure-smime-sign-with-sender'."
@@ -451,9 +448,9 @@ If set, it is added to the setting of `mml-secure-smime-sign-with-sender'."
   :type '(repeat (string :tag "Key ID")))
 
 (define-obsolete-variable-alias
-  'mml1991-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self "25.1")
+  'mml1991-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self)
 (define-obsolete-variable-alias
-  'mml2015-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self "25.1")
+  'mml2015-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self)
 (defcustom mml-secure-openpgp-encrypt-to-self nil
   "List of own key ID(s) or t; determines additional recipients with OpenPGP.
 If t, also encrypt to key for message sender; if list, encrypt to those keys.
@@ -472,7 +469,7 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
 		 (repeat (string :tag "Key ID"))))
 
 (define-obsolete-variable-alias
-  'mml-smime-encrypt-to-self 'mml-secure-smime-encrypt-to-self "25.1")
+  'mml-smime-encrypt-to-self 'mml-secure-smime-encrypt-to-self)
 (defcustom mml-secure-smime-encrypt-to-self nil
   "List of own key ID(s) or t; determines additional recipients with S/MIME.
 If t, also encrypt to key for message sender; if list, encrypt to those keys.
@@ -491,7 +488,7 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
 		 (repeat (string :tag "Key ID"))))
 
 (define-obsolete-variable-alias
-  'mml2015-sign-with-sender 'mml-secure-openpgp-sign-with-sender "25.1")
+  'mml2015-sign-with-sender 'mml-secure-openpgp-sign-with-sender)
 ;mml1991-sign-with-sender did never exist.
 (defcustom mml-secure-openpgp-sign-with-sender nil
   "If t, use message sender to find an OpenPGP key to sign with."
@@ -499,14 +496,14 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
   :type 'boolean)
 
 (define-obsolete-variable-alias
-  'mml-smime-sign-with-sender 'mml-secure-smime-sign-with-sender "25.1")
+  'mml-smime-sign-with-sender 'mml-secure-smime-sign-with-sender)
 (defcustom mml-secure-smime-sign-with-sender nil
   "If t, use message sender to find an S/MIME key to sign with."
   :group 'mime-security
   :type 'boolean)
 
 (define-obsolete-variable-alias
-  'mml2015-always-trust 'mml-secure-openpgp-always-trust "25.1")
+  'mml2015-always-trust 'mml-secure-openpgp-always-trust)
 ;mml1991-always-trust did never exist.
 (defcustom mml-secure-openpgp-always-trust t
   "If t, skip key validation of GnuPG on encryption."
diff --git a/lisp/nntp.el b/lisp/nntp.el
index f56b045..85ee937 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1117,12 +1117,22 @@ command whose response triggered the error."
   (nntp-with-open-group
       nil server
     (with-current-buffer nntp-server-buffer
+      (let* ((time (date-to-time date))
+	     (ls (- (cadr time) (nth 8 (decode-time time)))))
+	(cond ((< ls 0)
+	       (setcar time (1- (car time)))
+	       (setcar (cdr time) (+ ls 65536)))
+	      ((>= ls 65536)
+	       (setcar time (1+ (car time)))
+	       (setcar (cdr time) (- ls 65536)))
+	      (t
+	       (setcar (cdr time) ls)))
 	(prog1
 	    (nntp-send-command
 	     "^\\.\r?\n" "NEWGROUPS"
-	   (format-time-string "%y%m%d %H%M%S" (date-to-time date) t)
+	     (format-time-string "%y%m%d %H%M%S" time)
 	     "GMT")
-	(nntp-decode-text)))))
+	  (nntp-decode-text))))))
 
 (deffoo nntp-request-post (&optional server)
   (nntp-with-open-group

-----------------------------------------------------------------------
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  |   11 +++++++++++
 lisp/mml-sec.el |   21 +++++++++------------
 lisp/nntp.el    |   22 ++++++++++++++++------
 3 files changed, 36 insertions(+), 18 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