Mercurial > emacs
view etc/images/sort-ascending.xpm @ 93956:bfc762f0b49c
* vc-hooks.el (vc-state): Add new state `conflict'.
(vc-after-save): Use when not if.
(vc-default-mode-line-string): Deal with the conflict state.
(vc-prefix-map):
(vc-menu-map): Bind vc-status instead of vc-directory.
* vc.el (vc-editable-p):
(vc-default-status-printer):
(vc-next-action): Deal with the conflict state.
(vc-mark-resolved): New function.
(vc-status-mode): Fix mode name.
(vc-default-comment-history): Use when not if.
(Todo): Add new entries, remove old ones.
* vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
(vc-cvs-parse-status):
(vc-cvs-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
Detect the conflict state.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Thu, 10 Apr 2008 07:32:25 +0000 |
parents | 75b06a7624a1 |
children |
line wrap: on
line source
/* XPM */ static char * sort_ascending_xpm[] = { "24 24 34 1", " c None", ". c #000000", "+ c #FAFAFA", "@ c #DDDFD2", "# c #8B8E7C", "$ c #E5E7DD", "% c #84A77E", "& c #586546", "* c #81A57C", "= c #EDEEE8", "- c #81A57B", "; c #ECEDE6", "> c #7EA379", ", c #7DA377", "' c #DDDFD3", ") c #7DA378", "! c #C9D5C4", "~ c #7EA378", "{ c #7C7E73", "] c #DFE7DE", "^ c #CCDACA", "/ c #90B08C", "( c #76986D", "_ c #6C855E", ": c #22231E", "< c #3F443B", "[ c #C8D8C7", "} c #9DB89A", "| c #76966B", "1 c #3D4237", "2 c #565B4E", "3 c #9EBA9A", "4 c #3C4237", "5 c #5E6154", " ", " ", " ", " .... ", " ..... .. .. ", " .+@#. .. .. ", " .$%&. ...... ", " .$*&. .. .. ", " .=-&. .. .. ", " .;-&. ", " .$*&. .. ", " .$*&. .. ", " .$>&. ", " .$,&. .. ", " .')&. .. ", " ...!~&... ", " .{]^/(_:. ...... ", " .<[}|1. ... ", " .234. ... ", " .5. ... ", " . ... ", " ...... ", " ", " "};