mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

; Fix byte-compilation warnings in admin/*.el

Browse source
This commit is contained in:
Mattias Engdegård 2022-12-28 13:25:49 +01:00
parent 1a88a28ace
commit a6db8464e1
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/gitmerge.el
View file

@ -293,7 +293,7 @@ should not be skipped."
"Try to resolve conflicts in FILE with smerge.
Returns non-nil if conflicts remain."
(unless (file-exists-p file) (error "Gitmerge-resolve: Can't find %s" file))
(with-demoted-errors
(with-demoted-errors "Error: %S"
(let ((exists (find-buffer-visiting file)))
(with-current-buffer (let ((enable-local-variables :safe)
(enable-local-eval nil))