Mercurial > emacs
diff lisp/ChangeLog @ 54402:8bf3846fc7dd
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.
| author | Masatake YAMATO <jet@gyve.org> |
|---|---|
| date | Mon, 15 Mar 2004 11:27:47 +0000 |
| parents | 7f6dab15e141 |
| children | a8163d589489 |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Mar 15 08:39:06 2004 +0000 +++ b/lisp/ChangeLog Mon Mar 15 11:27:47 2004 +0000 @@ -1,3 +1,21 @@ +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. + 2004-03-15 David Ponce <david@dponce.com> * ruler-mode.el: (ruler-mode-left-fringe-cols)