[gnus git] branch master updated: m0-13-115-g41ae6ab =1= Synch with emacs-25
Katsumi Yamaoka <[email protected]> Fri, 22 Jan 2016 03:36:55 +0100
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 41ae6ab8c74cb388999ed5411ac4c5823e1aa230 (commit)
from b148c9bedabfe2afd32eb560b09b795f2a6a9f6b (commit)
- Log -----------------------------------------------------------------
commit 41ae6ab8c74cb388999ed5411ac4c5823e1aa230
Author: Katsumi Yamaoka <[email protected]>
Date: Fri Jan 22 02:36:13 2016 +0000
Synch with emacs-25
2016-01-19 Katsumi Yamaoka <[email protected]>
* nnir.el (nnir-request-update-mark): Default to the original mark.
cf. <http://thread.gmane.org/gmane.emacs.gnus.general/86583>
and <http://thread.gmane.org/gmane.emacs.gnus.general/86640>
2016-01-14 Katsumi Yamaoka <[email protected]>
* nntp.el (nntp-request-newgroups): Simplify.
2016-01-13 Paul Eggert <[email protected]>
Fix NNTP NEWGROUPS off-by-a-few-hours bug.
* nntp.el (nntp-request-newgroups): Format string in Universal Time,
since we’re telling the server “GMT”.
2016-01-13 Glenn Morris <[email protected]>
* gnus-fun.el (gnus-x-face-omit-files, gnus-face-omit-files):
* gnus.el (gnus-valid-select-methods): Fix custom types.
* 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):
Add missing version tags.
* mml-smime.el (epg-key-sub-key-list, epg-sub-key-capability)
(epg-sub-key-validity): Fix declarations.
2016-01-04 Jens Lechtenboerger <[email protected]>
* message.el (message-send): Do secure signed Bcc handling (bug#18718).
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af48c7e..44c45f4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-19 Katsumi Yamaoka <[email protected]>
+
+ * nnir.el (nnir-request-update-mark): Default to the original mark.
+ cf. <http://thread.gmane.org/gmane.emacs.gnus.general/86583>
+ and <http://thread.gmane.org/gmane.emacs.gnus.general/86640>
+
2016-01-15 Eric Abrahamsen <[email protected]>
Honor docstring of gnus-group-get-new-news
@@ -5,6 +11,36 @@
* gnus-start.el (gnus-get-unread-articles): If the prefix arg is t,
but non-numeric, unconditionally consider all groups to need updating.
+2016-01-14 Katsumi Yamaoka <[email protected]>
+
+ * nntp.el (nntp-request-newgroups): Simplify.
+
+2016-01-13 Paul Eggert <[email protected]>
+
+ Fix NNTP NEWGROUPS off-by-a-few-hours bug.
+
+ * nntp.el (nntp-request-newgroups): Format string in Universal Time,
+ since we’re telling the server “GMT”.
+
+2016-01-13 Glenn Morris <[email protected]>
+
+ * gnus-fun.el (gnus-x-face-omit-files, gnus-face-omit-files):
+ * gnus.el (gnus-valid-select-methods): Fix custom types.
+
+ * 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):
+ Add missing version tags.
+
+ * mml-smime.el (epg-key-sub-key-list, epg-sub-key-capability)
+ (epg-sub-key-validity): Fix declarations.
+
+2016-01-04 Jens Lechtenboerger <[email protected]>
+
+ * message.el (message-send): Do secure signed Bcc handling (bug#18718).
+
2015-12-28 Katsumi Yamaoka <[email protected]>
* mml-sec.el (mml-secure-bcc-is-safe):
diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index fa78b5c..a6b2730 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -44,7 +44,7 @@
"Regexp to match faces in `gnus-x-face-directory' to be omitted."
:version "25.1"
:group 'gnus-fun
- :type 'string)
+ :type '(choice (const nil) string))
(defcustom gnus-face-directory (expand-file-name "faces" gnus-directory)
"*Directory where Face PNG files are stored."
@@ -56,7 +56,7 @@
"Regexp to match faces in `gnus-face-directory' to be omitted."
:version "25.1"
:group 'gnus-fun
- :type 'string)
+ :type '(choice (const nil) string))
(defcustom gnus-convert-pbm-to-x-face-command "pbmtoxbm %s | compface"
"Command for converting a PBM to an X-Face."
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 19807fc..8e0e55a 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1637,6 +1637,7 @@ this variable. I think."
(const post-mail))
(checklist :inline t :greedy t
(const :format "%v " address)
+ (const cloud)
(const global)
(const :format "%v " prompt-address)
(const :format "%v " physical-address)
diff --git a/lisp/message.el b/lisp/message.el
index 400ddd1..bd95edf 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4271,6 +4271,8 @@ Instead, just auto-save the buffer and then bury it."
(if message-return-action
(apply (car message-return-action) (cdr message-return-action))))
+(autoload 'mml-secure-bcc-is-safe "mml-sec")
+
(defun message-send (&optional arg)
"Send the message in the current buffer.
If `message-interactive' is non-nil, wait for success indication or
@@ -4285,6 +4287,7 @@ It should typically alter the sending method in some way or other."
(let ((inhibit-read-only t))
(put-text-property (point-min) (point-max) 'read-only nil))
(message-fix-before-sending)
+ (mml-secure-bcc-is-safe)
(run-hooks 'message-send-hook)
(when message-confirm-send
(or (y-or-n-p "Send message? ")
diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index 0a5f472..48e6384 100644
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -432,15 +432,18 @@ 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)
-(define-obsolete-variable-alias 'mml2015-signers 'mml-secure-openpgp-signers)
+(define-obsolete-variable-alias 'mml1991-signers 'mml-secure-openpgp-signers
+ "25.1")
+(define-obsolete-variable-alias 'mml2015-signers 'mml-secure-openpgp-signers
+ "25.1")
(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)
+(define-obsolete-variable-alias 'mml-smime-signers 'mml-secure-smime-signers
+ "25.1")
(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'."
@@ -448,9 +451,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)
+ 'mml1991-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self "25.1")
(define-obsolete-variable-alias
- 'mml2015-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self)
+ 'mml2015-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self "25.1")
(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.
@@ -469,7 +472,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)
+ 'mml-smime-encrypt-to-self 'mml-secure-smime-encrypt-to-self "25.1")
(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.
@@ -488,7 +491,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)
+ 'mml2015-sign-with-sender 'mml-secure-openpgp-sign-with-sender "25.1")
;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."
@@ -496,14 +499,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)
+ 'mml-smime-sign-with-sender 'mml-secure-smime-sign-with-sender "25.1")
(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)
+ 'mml2015-always-trust 'mml-secure-openpgp-always-trust "25.1")
;mml1991-always-trust did never exist.
(defcustom mml-secure-openpgp-always-trust t
"If t, skip key validation of GnuPG on encryption."
@@ -513,6 +516,7 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
(defcustom mml-secure-fail-when-key-problem nil
"If t, raise an error if some key is missing or several keys exist.
Otherwise, ask the user."
+ :version "25.1"
:group 'mime-security
:type 'boolean)
@@ -523,6 +527,7 @@ This variable is only relevant if a recipient owns multiple key pairs (for
encryption) or you own multiple key pairs (for signing). In such cases,
you will be asked which key(s) should be used, and your choice can be
customized in this variable."
+ :version "25.1"
:group 'mime-security
:type '(alist :key-type (symbol :tag "Protocol") :value-type
(alist :key-type (symbol :tag "Usage") :value-type
diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index a40595e..2d8f25c 100644
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -350,9 +350,9 @@ Whether the passphrase is cached at all is controlled by
(autoload 'epg-expand-group "epg-config")
(autoload 'epa-select-keys "epa"))
-(declare-function epg-key-sub-key-list "ext:epg" (key))
-(declare-function epg-sub-key-capability "ext:epg" (sub-key))
-(declare-function epg-sub-key-validity "ext:epg" (sub-key))
+(declare-function epg-key-sub-key-list "epg" (key) t)
+(declare-function epg-sub-key-capability "epg" (sub-key) t)
+(declare-function epg-sub-key-validity "epg" (sub-key) t)
(autoload 'mml-compute-boundary "mml")
diff --git a/lisp/nnir.el b/lisp/nnir.el
index 183e144..560ba8a 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -822,8 +822,10 @@ skips all prompting."
(deffoo nnir-request-update-mark (group article mark)
(let ((artgroup (nnir-article-group article))
(artnumber (nnir-article-number article)))
- (when (and artgroup artnumber)
- (gnus-request-update-mark artgroup artnumber mark))))
+ (or (and artgroup
+ artnumber
+ (gnus-request-update-mark artgroup artnumber mark))
+ mark)))
(deffoo nnir-request-set-mark (group actions &optional server)
(nnir-possibly-change-group group server)
diff --git a/lisp/nntp.el b/lisp/nntp.el
index 0e10dfd..f56b045 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1117,22 +1117,12 @@ 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" time)
+ (format-time-string "%y%m%d %H%M%S" (date-to-time date) t)
"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 | 36 ++++++++++++++++++++++++++++++++++++
lisp/gnus-fun.el | 4 ++--
lisp/gnus.el | 1 +
lisp/message.el | 3 +++
lisp/mml-sec.el | 23 ++++++++++++++---------
lisp/mml-smime.el | 6 +++---
lisp/nnir.el | 6 ++++--
lisp/nntp.el | 26 ++++++++------------------
8 files changed, 71 insertions(+), 34 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