Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
23c726f6
Commit
23c726f6
authored
Aug 09, 2012
by
Glenn Morris
Browse files
* admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.
parent
fbb5e336
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
admin/ChangeLog
admin/ChangeLog
+4
-0
admin/bzrmerge.el
admin/bzrmerge.el
+2
-1
No files found.
admin/ChangeLog
View file @
23c726f6
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.
...
...
admin/bzrmerge.el
View file @
23c726f6
...
...
@@ -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)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment