* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 853c1941a92d35dd933582f30c7c8584dbcf997e..7aaeb1d5ee29e806adf084c985779f9a7b5eedaf 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.

diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 33cbae22a6cfe5215e3afd5056018519af313fd1..583f0d88866219dfc985455f988fd121652fc2e1 100644 (file)
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -146,7 +146,8 @@ are both lists of revnos, in oldest-first order."
   (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 (find-file-noselect file)
+      (with-current-buffer (let ((enable-local-variables :safe))
+                             (find-file-noselect file))
         (if (buffer-modified-p)
             (error "Unsaved changes in %s" (current-buffer)))
         (save-excursion