summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Steingold <sds@gnu.org>2010-04-27 11:13:42 -0400
committerSam Steingold <sds@gnu.org>2010-04-27 11:13:42 -0400
commit2a6f654ef1656603fa9f3d925efe3e1a5cbe0ecc (patch)
tree49949dbcc8df946d165f0660044e41517128d66d
parentcecaa6745f10332a30f4ba42c0e41278072b92e3 (diff)
downloademacs-2a6f654ef1656603fa9f3d925efe3e1a5cbe0ecc.tar.gz
(bug-reference-url-format): Mark as `safe-local-variable' if the value
is a string or a function, as documented and implemented on 2010-04-02.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/bug-reference.el3
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2cdf49aa00e..1d07fc85a15 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-27 Sam Steingold <sds@gnu.org>
+
+ * progmodes/bug-reference.el (bug-reference-url-format): Mark as
+ `safe-local-variable' if the value is a string or a function, as
+ documented and implemented on 2010-04-02.
+
2010-04-27 Juanma Barranquero <lekktu@gmail.com>
* ido.el (ido-buffer-internal): Bind `ido-use-virtual-buffers' to nil
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index 462f978ab78..1ddfddf89c1 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -51,7 +51,8 @@ It can use `match-string' to get parts matched against
There is no default setting for this, it must be set per file.")
;;;###autoload
-(put 'bug-reference-url-format 'safe-local-variable 'stringp)
+(put 'bug-reference-url-format 'safe-local-variable
+ (lambda (s) (or (stringp s) (functionp s))))
(defconst bug-reference-bug-regexp
"\\([Bb]ug ?#\\|[Pp]atch ?#\\|RFE ?#\\|PR [a-z-+]+/\\)\\([0-9]+\\)"