Mercurial > emacs
view lisp/sb-tag-minus.xpm @ 47828:4944e0ddf992
(add-change-log-entry): Don't call find-file at all
if we're already in the proper buffer.
(change-log-resolve-conflict): New fun.
(change-log-mode): Use it and use define-derived-mode.
(change-log-merge): Allow other-log to be a buffer.
Don't add a \n if there are already enough \n's.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 10 Oct 2002 17:45:17 +0000 |
| parents | b33142291391 |
| children | c2a09ac7b7b1 |
line wrap: on
line source
/* XPM */ static char * sb_tag__xpm[] = { "20 15 4 1", " c None", ". c #828282", "+ c #000000", "@ c #FFF993", " ", " ", " ............... ", " .+++++++++++++++.", " .+@@@@@@@@@@@@@@+.", " .+@@@@@@@@@@@@@@@+.", ".+@@@@@@@@@@@@@@@@+.", ".+@++@@++++++@@@@@+.", ".+@++@@++++++@@@@@+.", ".+@@@@@@@@@@@@@@@@+.", " .+@@@@@@@@@@@@@@@+.", " .+@@@@@@@@@@@@@@+.", ". .+++++++++++++++.", " ............... ", " "};