Mercurial > emacs
view lisp/sb-tag-type.xpm @ 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 | c0758fd9ca7a |
| children | c2a09ac7b7b1 |
line wrap: on
line source
/* XPM */ static char * sb_tag_type_xpm[] = { "20 15 4 1", " c None", ". c #828282", "+ c #000000", "@ c #FFF993", " ", " ", " ............... ", " .+++++++++++++++.", " .+@@@@@@@@@@@@@@+.", " .+@@@@@@++++++@@@+.", ".+@@@@@@@++++++@@@+.", ".+@++@@@@@@++@@@@@+.", ".+@++@@@@@@++@@@@@+.", ".+@@@@@@@@@++@@@@@+.", " .+@@@@@@@@++@@@@@+.", " .+@@@@@@@@@@@@@@+.", ". .+++++++++++++++.", " ............... ", " "};