From: Sam Steingold <sds@gnu.org>
Date: Tue, 27 Apr 2010 15:13:42 +0000 (-0400)
Subject: (bug-reference-url-format): Mark as `safe-local-variable' if the value
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~365
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a6f654ef1656603fa9f3d925efe3e1a5cbe0ecc;p=emacs.git

(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.
---

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]+\\)"