Mercurial > emacs
annotate oldXMenu/copyright.h @ 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 | e806467e7c39 |
| children | 07774e5c3ff5 dd7c098af727 ef719132ddfa |
| rev | line source |
|---|---|
| 25858 | 1 /* |
| 2 | |
| 3 Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology | |
| 4 | |
| 5 Permission to use, copy, modify, and distribute this | |
| 6 software and its documentation for any purpose and without | |
| 7 fee is hereby granted, provided that the above copyright | |
| 8 notice appear in all copies and that both that copyright | |
| 9 notice and this permission notice appear in supporting | |
| 10 documentation, and that the name of M.I.T. not be used in | |
| 11 advertising or publicity pertaining to distribution of the | |
| 12 software without specific, written prior permission. | |
| 13 M.I.T. makes no representations about the suitability of | |
| 14 this software for any purpose. It is provided "as is" | |
| 15 without express or implied warranty. | |
| 16 | |
| 17 */ | |
| 18 | |
| 52401 | 19 /* arch-tag: c689b1bc-a3ba-41a1-baa0-a3622b5445b2 |
| 20 (do not change this comment) */ |