diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/bug-reference.el | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 03deb82d0b1..a97a6e9cc7d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-04-28 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * progmodes/bug-reference.el (bug-reference-url-format): Revert | ||
| 4 | 2010-04-27 change due to security risk. | ||
| 5 | |||
| 1 | 2010-04-28 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2010-04-28 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | Make it possible to locally disable a globally enabled mode. | 8 | Make it possible to locally disable a globally enabled mode. |
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el index 1ddfddf89c1..462f978ab78 100644 --- a/lisp/progmodes/bug-reference.el +++ b/lisp/progmodes/bug-reference.el | |||
| @@ -51,8 +51,7 @@ 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 | 54 | (put 'bug-reference-url-format 'safe-local-variable 'stringp) |
| 55 | (lambda (s) (or (stringp s) (functionp s)))) | ||
| 56 | 55 | ||
| 57 | (defconst bug-reference-bug-regexp | 56 | (defconst bug-reference-bug-regexp |
| 58 | "\\([Bb]ug ?#\\|[Pp]atch ?#\\|RFE ?#\\|PR [a-z-+]+/\\)\\([0-9]+\\)" | 57 | "\\([Bb]ug ?#\\|[Pp]atch ?#\\|RFE ?#\\|PR [a-z-+]+/\\)\\([0-9]+\\)" |