From: Glenn Morris Date: Sat, 21 May 2011 21:19:30 +0000 (-0700) Subject: * admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~220 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a35386df43842ade192a4f5fea5a412cf0d8d29;p=emacs.git * admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals. --- diff --git a/admin/ChangeLog b/admin/ChangeLog index 853c1941a92..7aaeb1d5ee2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2011-05-21 Glenn Morris + + * bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals. + 2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 33cbae22a6c..583f0d88866 100644 --- 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