Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com

2 files changed, 6 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 79a55707dd4..f9986951388 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-10  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-resolve): Disable local eval:.
+
 2012-08-07  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * coccinelle/overlay.cocci, coccinelle/symbol.cocci: Remove.
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 977e95860e2..e174312143d 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -160,7 +160,8 @@ Type `y' to skip this revision,
   (unless (file-exists-p file) (error "Bzrmerge-resolve: Can't find %s" file))
   (with-demoted-errors
     (let ((exists (find-buffer-visiting file)))
-      (with-current-buffer (let ((enable-local-variables :safe))
+      (with-current-buffer (let ((enable-local-variables :safe)
+                                 (enable-local-eval nil))
                              (find-file-noselect file))
         (if (buffer-modified-p)
             (error "Unsaved changes in %s" (current-buffer)))