| commit | f82400798ee4f7b0945c7b14e15c806108a504cb | |
| author | Eli Zaretskii <eliz@gnu.org> | |
| Fri, 5 Jan 2018 09:22:27 +0000 (5 11:22 +0200) | ||
| committer | Eli Zaretskii <eliz@gnu.org> | |
| Fri, 5 Jan 2018 09:22:27 +0000 (5 11:22 +0200) | ||
| tree | 6636b563406855d4b9b78c82b4821a75caf64e57 | treesnapshot (tar.gz zip) |
| parent | c967ba186137e48b14c25ce2a439293fe07ead34 | commitdiff |
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 (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 | diffblobblamehistory |