(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 2cdf49aa00e81a40f3ba4ad44701f0488730d596..1d07fc85a1523db1491f5ae660c2ef1850597036 100644 (file)
--- 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 462f978ab787e3e03cb62f99b5eb6c13e493242a..1ddfddf89c15489e35bf8b3374fcaf22ae4a34ec 100644 (file)
--- 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]+\\)"