Mercurial > emacs
view oldXMenu/Error.c @ 104277:affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-insert-isearch-string): new function.
(viper-if-string): redefine C-s in the minibuffer to insert the last
incremental search string.
* ediff-init.el (ediff-coding-system): use escape-quoted in case of
XEmacs.
* ediff-merg.el (ediff-merge-region-is-non-clash-to-skip,
ediff-merge-region-is-non-clash,
ediff-skip-merge-region-if-changed-from-default-p): use defun.
Also check if the job is really a merge job.
* ediff.el (ediff-current-file): new function.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Sat, 15 Aug 2009 05:57:08 +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) */