diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-02-18 09:43:59 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-02-18 09:43:59 -0500 |
| commit | 2ede38ce4bf336c573450c61a2e9a41fb7ebe1be (patch) | |
| tree | 2d4a9ddfc202cbc9859a1818a325409f58a71b07 /lisp/emacs-lisp | |
| parent | 2eecaa28972320a1b8886ac8cde353c2a2f4aa44 (diff) | |
| download | emacs-2ede38ce4bf336c573450c61a2e9a41fb7ebe1be.tar.gz emacs-2ede38ce4bf336c573450c61a2e9a41fb7ebe1be.tar.bz2 emacs-2ede38ce4bf336c573450c61a2e9a41fb7ebe1be.zip | |
* lisp/vc/smerge-mode.el (smerge-change-buffer-confirm): New var
(smerge-vc-next-conflict): Obey it. Save buffer before going to
the next. Don't emit message when vc-find-conflicted-file can't find
other conflicted file.
* lisp/vc/vc-hooks.el: Use lexical-binding.
* lisp/vc/vc.el: Remove redundant :groups.
(vc-find-conflicted-file): Autoload.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions