diff options
| -rw-r--r-- | admin/ChangeLog | 4 | ||||
| -rw-r--r-- | admin/bzrmerge.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 75079a335c9..abe759dc53c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -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. diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index cb63d5b16ba..77a5f0f4c44 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -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))) |