]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c967ba1) | patch
Fix failures in smerge-mode on MS-Windows
authorEli Zaretskii <eliz@gnu.org>
Fri, 5 Jan 2018 09:22:27 +0000 (11:22 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 5 Jan 2018 09:22:27 +0000 (11:22 +0200)
commitf82400798ee4f7b0945c7b14e15c806108a504cb
tree6636b563406855d4b9b78c82b4821a75caf64e57tree | snapshot
parentc967ba186137e48b14c25ce2a439293fe07ead34commit | diff
Fix failures in smerge-mode on MS-Windows

* lisp/vc/smerge-mode.el (smerge--refine-chopup-region): Use
utf-8-emacs-unix, not emacs-internal, to make the forced EOL
convention explicit.
(smerge-refine-regions): Use utf-8-emacs instead of
emacs-internal, to allow decoding of non-Unix EOL conventions.
(Bug#29916)
lisp/vc/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.