From 2a5233c3c44d3ae6183d8b766f1a86083c318119 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sat, 30 Jan 2016 11:36:41 -0800
Subject: [PATCH] Mark some user options that can get evalled as risky.

* lisp/allout.el (allout-title):
* lisp/emacs-lisp/edebug.el (edebug-global-break-condition):
* lisp/gnus/message.el (message-mailer-swallows-blank-line):
* lisp/progmodes/gud.el (gud-tooltip-display):
* lisp/vc/ediff-mult.el (ediff-default-filtering-regexp):
Mark as risky.
---
 lisp/allout.el            | 4 ++--
 lisp/emacs-lisp/edebug.el | 1 +
 lisp/gnus/message.el      | 2 ++
 lisp/progmodes/gud.el     | 1 +
 lisp/vc/ediff-mult.el     | 3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lisp/allout.el b/lisp/allout.el
index 15a8a111738..49bdc06fbb0 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -797,9 +797,9 @@ numbers are always used."
   :group 'allout)
 ;;;_  - allout-title
 (defcustom allout-title '(or buffer-file-name (buffer-name))
-  "Expression to be evaluated to determine the title for LaTeX
-formatted copy."
+  "Expression to evaluate to determine the title for LaTeX formatted copy."
   :type 'sexp
+  :risky t
   :group 'allout)
 ;;;_  - allout-line-skip
 (defcustom allout-line-skip ".05cm"
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 5b841e88165..e8484fa1f94 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -225,6 +225,7 @@ After execution is resumed, the error is signaled again."
   "If non-nil, an expression to test for at every stop point.
 If the result is non-nil, then break.  Errors are ignored."
   :type 'sexp
+  :risky t
   :group 'edebug)
 
 (defcustom edebug-sit-for-seconds 1
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 51dcc1a909f..f175036e96f 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1073,6 +1073,7 @@ 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
+  :risky t
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
 
@@ -1287,6 +1288,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
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 1a0385e167e..7843efdf158 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3421,6 +3421,7 @@ it if ARG is omitted or nil."
 Forms in the list are combined with AND.  The default is to display
 only tooltips in the buffer containing the overlay arrow."
   :type 'sexp
+  :risky t
   :group 'gud
   :group 'tooltip)
 
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 9c763d4a232..7f0db5d45dc 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -174,7 +174,8 @@ directories.")
 (defcustom ediff-default-filtering-regexp nil
   "The default regular expression used as a filename filter in multifile comparisons.
 Should be a sexp.  For instance (car ediff-filtering-regexp-history) or nil."
-  :type 'sexp
+  :type 'sexp                           ; yuck - why not just a regexp?
+  :risky t
   :group 'ediff-mult)
 
 ;; This has the form ((meta-buf regexp dir1 dir2 dir3 merge-auto-store-dir)
-- 
2.11.4.GIT