[Emacs-diffs] /srv/bzr/emacs/trunk r104308: * admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.

[Glenn Morris]

------------------------------------------------------------
revno: 104308
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-05-21 14:19:30 -0700
message:
  * admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
modified:
  admin/ChangeLog
  admin/bzrmerge.el

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2011-04-10 16:33:22 +0000
+++ b/admin/ChangeLog   2011-05-21 21:19:30 +0000
@@ -1,3 +1,7 @@
+2011-05-21  Glenn Morris  <address@hidden>
+
+       * bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
+
 2011-03-07  Chong Yidong  <address@hidden>
 
        * Version 23.3 released.

=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2011-02-23 03:50:04 +0000
+++ b/admin/bzrmerge.el 2011-05-21 21:19:30 +0000
@@ -146,7 +146,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 (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