aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-04-28 11:45:45 -0400
committerChong Yidong2010-04-28 11:45:45 -0400
commit36045ff3301341130c1e2048a0fa73ec72fc68bf (patch)
treee5d6aae122a82287d28d7ef3e96ed879e17633f2
parent56924d996f1ed21fdcfedd80792a5fe718b3f831 (diff)
downloademacs-36045ff3301341130c1e2048a0fa73ec72fc68bf.tar.gz
emacs-36045ff3301341130c1e2048a0fa73ec72fc68bf.zip
Revert last bug-reference-url-format change.
* progmodes/bug-reference.el (bug-reference-url-format): Revert 2010-04-27 change due to security risk.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/bug-reference.el3
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 @@
12010-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
12010-04-28 Stefan Monnier <monnier@iro.umontreal.ca> 62010-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
51There is no default setting for this, it must be set per file.") 51There 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]+\\)"