diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-08-09 23:57:34 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-08-09 23:57:34 -0700 |
| commit | 23c726f65afecf33df75e5c62d5d930e0d672f01 (patch) | |
| tree | f3006f2ac2b300be0eaaa3c9f9261262922c54ff /admin/bzrmerge.el | |
| parent | fbb5e3364871172431e32b4b722d1e1fd6312330 (diff) | |
| download | emacs-23c726f65afecf33df75e5c62d5d930e0d672f01.tar.gz | |
* admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.
Diffstat (limited to 'admin/bzrmerge.el')
| -rw-r--r-- | admin/bzrmerge.el | 3 |
1 files changed, 2 insertions, 1 deletions
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))) |