Mercurial > emacs
diff update-subdirs @ 28248:108ba8d61036
(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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 22 Mar 2000 00:54:55 +0000 |
| parents | 3ede6c50d7f5 |
| children | f440b9766968 |