Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 54401:7f6dab15e141 | 54402:8bf3846fc7dd |
|---|---|
| 1 2004-03-15 Masatake YAMATO <jet@gyve.org> | |
| 2 | |
| 3 Added context menu support in smerge mode. | |
| 4 Most of the part is written by Stefan Monnier. | |
| 5 | |
| 6 * smerge-mode.el (smerge-context-menu-map, smerge-context-menu): New | |
| 7 keyman and menu. | |
| 8 (smerge-text-properties): New function. | |
| 9 (smerge-remove-props): New function. | |
| 10 (smerge-popup-context-menu): New function. | |
| 11 (smerge-resolve): Call `smerge-remove-props'. | |
| 12 (smerge-keep-base, smerge-keep-other, smerge-keep-mine): | |
| 13 Ditto. | |
| 14 (smerge-keep-current): Ditto. | |
| 15 (smerge-kill-current): New function. | |
| 16 (smerge-match-conflict): Detect the file as `a same-diff conflict' | |
| 17 if the filename is "ANCESTOR". Put text properties. | |
| 18 | |
| 1 2004-03-15 David Ponce <david@dponce.com> | 19 2004-03-15 David Ponce <david@dponce.com> |
| 2 | 20 |
| 3 * ruler-mode.el: (ruler-mode-left-fringe-cols) | 21 * ruler-mode.el: (ruler-mode-left-fringe-cols) |
| 4 (ruler-mode-right-fringe-cols, ruler-mode-left-scroll-bar-cols) | 22 (ruler-mode-right-fringe-cols, ruler-mode-left-scroll-bar-cols) |
| 5 (ruler-mode-right-scroll-bar-cols): Remove. | 23 (ruler-mode-right-scroll-bar-cols): Remove. |