diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2018-01-05 11:22:27 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-01-05 11:22:27 +0200 |
| commit | f82400798ee4f7b0945c7b14e15c806108a504cb (patch) | |
| tree | 6636b563406855d4b9b78c82b4821a75caf64e57 /src/termcap.c | |
| parent | c967ba186137e48b14c25ce2a439293fe07ead34 (diff) | |
| download | emacs-f82400798ee4f7b0945c7b14e15c806108a504cb.tar.gz emacs-f82400798ee4f7b0945c7b14e15c806108a504cb.tar.bz2 emacs-f82400798ee4f7b0945c7b14e15c806108a504cb.zip | |
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)
Diffstat (limited to 'src/termcap.c')
0 files changed, 0 insertions, 0 deletions