[gnus git] branch master updated: m0-13-120-g0ddd465 =1= 2016-01-30 Glenn Morris <[email protected]> * message.el (message-deletable-headers, message-signature): Improve custom type. * gnus-kill.el (gnus-winconf-kill-file): Not user-serviceable. Mark some user options that can get evalled as risky. * message.el (message-signature, message-mailer-swallows-blank-line): Mark as risky.

       via  0ddd465ebf3af16091533771f836a3208a9f1f74 (commit)
      from  9cfafae1615983b82ea03c78dcb19f82b8b80f86 (commit)


- Log -----------------------------------------------------------------
commit 0ddd465ebf3af16091533771f836a3208a9f1f74
Author: Glenn Morris <[email protected]>
Date:   Sun Jan 31 12:01:51 2016 +0000

    2016-01-30 Glenn Morris  <[email protected]>
    * message.el (message-deletable-headers, message-signature):
    Improve custom type.
    * gnus-kill.el (gnus-winconf-kill-file): Not user-serviceable.
    Mark some user options that can get evalled as risky.
    * message.el (message-signature, message-mailer-swallows-blank-line):
    Mark as risky.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4b8dae..6969181 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2016-01-30  Glenn Morris  <[email protected]>
+
+	* message.el (message-deletable-headers, message-signature):
+	Improve custom type.
+
+	* gnus-kill.el (gnus-winconf-kill-file): Not user-serviceable.
+
+	Mark some user options that can get evalled as risky.
+
+	* message.el (message-signature, message-mailer-swallows-blank-line):
+	Mark as risky.
+
 2016-01-29  Glenn Morris  <[email protected]>
 
 	Remove some useless-use-of eval.
diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el
index 9c06d4b..059a5cd 100644
--- a/lisp/gnus-kill.el
+++ b/lisp/gnus-kill.el
@@ -47,11 +47,9 @@
   :group 'gnus-score-kill
   :type 'boolean)
 
-(defcustom gnus-winconf-kill-file nil
+(defvar gnus-winconf-kill-file nil
   "What does this do, Lars?
-I don't know, Per."
-  :group 'gnus-score-kill
-  :type 'sexp)
+I don't know, Per.")
 
 (defcustom gnus-kill-killed t
   "*If non-nil, Gnus will apply kill files to already killed articles.
diff --git a/lisp/message.el b/lisp/message.el
index bd95edf..20e32c1 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -260,10 +260,10 @@ This is a list of regexps and regexp matches."
   :type '(repeat regexp))
 
 (defcustom message-deletable-headers '(Message-ID Date Lines)
-  "Headers to be deleted if they already exist and were generated by message previously."
+  "Headers to delete if present and previously generated by message."
   :group 'message-headers
   :link '(custom-manual "(message)Message Headers")
-  :type 'sexp)
+  :type '(repeat (symbol :tag "Header")))
 
 (defcustom message-ignored-news-headers
   "^NNTP-Posting-Host:\\|^Xref:\\|^[BGF]cc:\\|^Resent-Fcc:\\|^X-Draft-From:\\|^X-Gnus-Agent-Meta-Information:\\|^X-Message-SMTP-Method:\\|^X-Gnus-Delayed:"
@@ -1112,7 +1112,10 @@ If t, the `message-signature-file' file will be inserted instead.
 If a function, the result from the function will be used instead.
 If a form, the result from the form will be used instead."
   :version "23.2"
-  :type 'sexp
+  :type '(choice string (const :tag "Contents of signature file" t)
+		 function
+		 sexp)
+  :risky t
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
 
@@ -1331,6 +1334,7 @@ The value should be an expression to test whether the problem will
 actually occur."
   :group 'message-sending
   :link '(custom-manual "(message)Mail Variables")
+  :risky t
   :type 'sexp)
 
 ;;;###autoload

-----------------------------------------------------------------------
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    |   12 ++++++++++++
 lisp/gnus-kill.el |    6 ++----
 lisp/message.el   |   10 +++++++---
 3 files changed, 21 insertions(+), 7 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