view etc/letter.xpm @ 65129:8303172e4c68

(smerge-remove-props): Make the args non-optional. (smerge-keep-n): Remove props. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-kill-current): Don't remove props anymore now that it's done in smerge-keep-n. (smerge-refined-change): New face. (smerge-refine-chopup-region, smerge-refine-highlight-change) (smerge-refine): New funs. (smerge-basic-map): Bind smerge-refine.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 25 Aug 2005 20:13:38 +0000
parents bc20bf61a6e9
children
line wrap: on
line source

/* XPM */
static char * letter_xpm[] = {
"14 10 2 1",
".	c opaque",
" 	c None",
"..............",
"...        ...",
".  .      .  .",
".   .    .   .",
".    ....    .",
".   . .. .   .",
".  .      .  .",
". .        . .",
"..          ..",
".............."};