[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108098: * admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.

[Glenn Morris]

------------------------------------------------------------
revno: 108098
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-08-09 23:57:34 -0700
message:
  * admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.
modified:
  admin/ChangeLog
  admin/bzrmerge.el

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2012-07-14 10:46:56 +0000
+++ b/admin/ChangeLog   2012-08-10 06:57:34 +0000
@@ -1,3 +1,7 @@
+2012-08-10  Glenn Morris  <address@hidden>
+
+       * bzrmerge.el (bzrmerge-resolve): Disable local eval:.
+
 2012-07-14  Eli Zaretskii  <address@hidden>
 
        * CPP-DEFINES: Remove FILE_SYSTEM_CASE.

=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2012-01-19 06:42:57 +0000
+++ b/admin/bzrmerge.el 2012-08-10 06:57:34 +0000
@@ -160,7 +160,8 @@
   (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)))