diff options
| author | Masatake YAMATO <jet@gyve.org> | 2004-03-15 11:27:47 +0000 |
|---|---|---|
| committer | Masatake YAMATO <jet@gyve.org> | 2004-03-15 11:27:47 +0000 |
| commit | 11ece56b1ab84d0ce8add8a1241ba7062e840860 (patch) | |
| tree | 3b6035739c3019d396d5f94ba4f70fa01be262fd /lisp/emacs-lisp/debug.el | |
| parent | 0eeebaf5d779e417c9582ccb1e7a1d20708f779d (diff) | |
| download | emacs-11ece56b1ab84d0ce8add8a1241ba7062e840860.tar.gz emacs-11ece56b1ab84d0ce8add8a1241ba7062e840860.tar.bz2 emacs-11ece56b1ab84d0ce8add8a1241ba7062e840860.zip | |
2004-03-15 Masatake YAMATO <jet@gyve.org>
Added context menu support in smerge mode.
Most of the part is written by Stefan Monnier.
* smerge-mode.el (smerge-context-menu-map, smerge-context-menu): New
keyman and menu.
(smerge-text-properties): New function.
(smerge-remove-props): New function.
(smerge-popup-context-menu): New function.
(smerge-resolve): Call `smerge-remove-props'.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine):
Ditto.
(smerge-keep-current): Ditto.
(smerge-kill-current): New function.
(smerge-match-conflict): Detect the file as `a same-diff conflict'
if the filename is "ANCESTOR". Put text properties.
Diffstat (limited to 'lisp/emacs-lisp/debug.el')
0 files changed, 0 insertions, 0 deletions