]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0ae39f5) | patch
(smerge-auto-leave): New function and variable.
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 22 Mar 2000 00:54:55 +0000 (00:54 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 22 Mar 2000 00:54:55 +0000 (00:54 +0000)
commitf97e9a8a437aa6b7f4997cfb613a6955221efc79
tree29899f69878640b5c9a8e0edf4681f86df7a84fftree | snapshot
parent0ae39f53387ddc5e86114ce723606eb6bc0e6e13commit | diff
(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.
lisp/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.