2 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d205e36a749..d37b054e9d0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-20  Dan Nicolaescu  <dann@gnu.org>
+
+        * progmodes/hideshow.el (hs-block-end-regexp): Restore lost
+        buffer local setting.
+
 2012-08-15  Chong Yidong  <cyd@gnu.org>
 
         * Version 24.2 released.
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 26db60ddbc2..8463648e679 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -408,6 +408,8 @@ element (using `match-beginning') before calling `hs-forward-sexp-func'.")
 
 (defvar hs-block-end-regexp nil
   "Regexp for end of block.")
+(make-variable-buffer-local 'hs-block-end-regexp)
+
 
 (defvar hs-forward-sexp-func 'forward-sexp
   "Function used to do a `forward-sexp'.