andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.

Browse source
This commit is contained in:
Glenn Morris 2012-08-09 23:57:34 -07:00
parent fbb5e33648
commit 23c726f65a
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 @@
2012-08-10 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-resolve): Disable local eval:.
2012-07-14 Eli Zaretskii <eliz@gnu.org>
* CPP-DEFINES: Remove FILE_SYSTEM_CASE.

3
admin/bzrmerge.el
View file

@ -160,7 +160,8 @@ Type `y' to skip this revision,
(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)))