Mercurial > emacs
view oldXMenu/Error.c @ 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 | fec5e03aaf59 |
children | edf631bdbb7a ec58e5c426ef 5cc91198ffb2 |
line wrap: on
line source
/* Copyright Massachusetts Institute of Technology 1985 */ #include "copyright.h" /* * XMenu: MIT Project Athena, X Window system menu package * * XMenuError - Returns a string description of the current * XMenu error status flag. * * Author: Tony Della Fera, DEC * August, 1985 * */ #include "XMenuInt.h" char * XMenuError() { static char message[128]; /* Error message buffer. */ if ((_XMErrorCode < XME_CODE_COUNT) && (_XMErrorCode >= 0)) { return(_XMErrorList[_XMErrorCode]); } sprintf(message, "Unknown _XMErrorCode: %d", _XMErrorCode); return(message); } /* arch-tag: 5fff4a23-40ca-40d0-8887-c50fc73dea9d (do not change this comment) */