diff options
Diffstat (limited to 'admin')
| -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 79a55707dd4..f9986951388 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-08-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-resolve): Disable local eval:. | ||
| 4 | |||
| 1 | 2012-08-07 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2012-08-07 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | * coccinelle/overlay.cocci, coccinelle/symbol.cocci: Remove. | 7 | * coccinelle/overlay.cocci, coccinelle/symbol.cocci: Remove. |
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 977e95860e2..e174312143d 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el | |||
| @@ -160,7 +160,8 @@ Type `y' to skip this revision, | |||
| 160 | (unless (file-exists-p file) (error "Bzrmerge-resolve: Can't find %s" file)) | 160 | (unless (file-exists-p file) (error "Bzrmerge-resolve: Can't find %s" file)) |
| 161 | (with-demoted-errors | 161 | (with-demoted-errors |
| 162 | (let ((exists (find-buffer-visiting file))) | 162 | (let ((exists (find-buffer-visiting file))) |
| 163 | (with-current-buffer (let ((enable-local-variables :safe)) | 163 | (with-current-buffer (let ((enable-local-variables :safe) |
| 164 | (enable-local-eval nil)) | ||
| 164 | (find-file-noselect file)) | 165 | (find-file-noselect file)) |
| 165 | (if (buffer-modified-p) | 166 | (if (buffer-modified-p) |
| 166 | (error "Unsaved changes in %s" (current-buffer))) | 167 | (error "Unsaved changes in %s" (current-buffer))) |