Mercurial > emacs
view oldXMenu/Error.c @ 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 | 3861ff8f4bf1 |
children | e8a3fb527b77 532e0a9335a9 2d92f5c9d6ae |
line wrap: on
line source
#include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ /* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */ /* * 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) */