Mercurial > emacs
comparison lib-src/ntlib.c @ 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 | b58a79fe0af2 |
| children | 1fd32e8a2fad |
comparison
equal
deleted
inserted
replaced
| 28247:57c889c9cedb | 28248:108ba8d61036 |
|---|