diff options
| author | Stefan Monnier | 2000-03-22 00:54:55 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2000-03-22 00:54:55 +0000 |
| commit | f97e9a8a437aa6b7f4997cfb613a6955221efc79 (patch) | |
| tree | 29899f69878640b5c9a8e0edf4681f86df7a84ff /src | |
| parent | 0ae39f53387ddc5e86114ce723606eb6bc0e6e13 (diff) | |
| download | emacs-f97e9a8a437aa6b7f4997cfb613a6955221efc79.tar.gz emacs-f97e9a8a437aa6b7f4997cfb613a6955221efc79.zip | |
(smerge-auto-leave): New function and variable.
(smerge-basic-map): Rename from smerge-basic-keymap.
Change the bindings for smerge-diff-*.
(smerge-*-map): Use easy-mmode-defmap.
(smerge-(next|prev)): Use easy-mmode-define-navigation.
(smerge-keep-*): Use smerge-auto-leave.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions