summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-mult.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2016-01-30 11:36:41 -0800
committerGlenn Morris <rgm@gnu.org>2016-01-30 11:36:41 -0800
commit2a5233c3c44d3ae6183d8b766f1a86083c318119 (patch)
treef479c55f58e63e2b6ef492cf70a1c3207e2e6eb4 /lisp/vc/ediff-mult.el
parent39b166fc43a37d1731a194c06deacba571894847 (diff)
downloademacs-2a5233c3c44d3ae6183d8b766f1a86083c318119.tar.gz
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.
Diffstat (limited to 'lisp/vc/ediff-mult.el')
-rw-r--r--lisp/vc/ediff-mult.el3
1 files changed, 2 insertions, 1 deletions
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)