diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/bug-reference.el | 3 |
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 @@ | |||
| 1 | 2010-04-27 Sam Steingold <sds@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/bug-reference.el (bug-reference-url-format): Mark as | ||
| 4 | `safe-local-variable' if the value is a string or a function, as | ||
| 5 | documented and implemented on 2010-04-02. | ||
| 6 | |||
| 1 | 2010-04-27 Juanma Barranquero <lekktu@gmail.com> | 7 | 2010-04-27 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 8 | ||
| 3 | * ido.el (ido-buffer-internal): Bind `ido-use-virtual-buffers' to nil | 9 | * 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 | |||
| 51 | There is no default setting for this, it must be set per file.") | 51 | There is no default setting for this, it must be set per file.") |
| 52 | 52 | ||
| 53 | ;;;###autoload | 53 | ;;;###autoload |
| 54 | (put 'bug-reference-url-format 'safe-local-variable 'stringp) | 54 | (put 'bug-reference-url-format 'safe-local-variable |
| 55 | (lambda (s) (or (stringp s) (functionp s)))) | ||
| 55 | 56 | ||
| 56 | (defconst bug-reference-bug-regexp | 57 | (defconst bug-reference-bug-regexp |
| 57 | "\\([Bb]ug ?#\\|[Pp]atch ?#\\|RFE ?#\\|PR [a-z-+]+/\\)\\([0-9]+\\)" | 58 | "\\([Bb]ug ?#\\|[Pp]atch ?#\\|RFE ?#\\|PR [a-z-+]+/\\)\\([0-9]+\\)" |