procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2011-05-21 14:19:30 -07:00
parent e8c061395d
commit 2a35386df4
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/ChangeLog
View file

@ -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.

3
admin/bzrmerge.el
View file

@ -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