view src/temacs.opt @ 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 18e524802887
children
line wrap: on
line source

cluster=emacs,,,-
DISPNEW.OBJ,-
SCROLL.OBJ,-
XDISP.OBJ,-
WINDOW.OBJ,-
TERM.OBJ,-
CM.OBJ,-
EMACS.OBJ,-
KEYBOARD.OBJ,-
MACROS.OBJ,-
KEYMAP.OBJ,-
SYSDEP.OBJ,-
BUFFER.OBJ,-
FILELOCK.OBJ,-
INSDEL.OBJ,-
MARKER.OBJ,-
MINIBUF.OBJ,-
FILEIO.OBJ,-
DIRED.OBJ,-
FILEMODE.OBJ,-
CMDS.OBJ,-
CASEFIDDLE.OBJ,-
INDENT.OBJ,-
SEARCH.OBJ,-
REGEX.OBJ,-
UNDO.OBJ,-
ALLOC.OBJ,-
DATA.OBJ,-
DOC.OBJ,-
EDITFNS.OBJ,-
CALLINT.OBJ,-
EVAL.OBJ,-
FNS.OBJ,-
PRINT.OBJ,-
LREAD.OBJ,-
ABBREV.OBJ,-
SYNTAX.OBJ,-
MOCKLISP.OBJ,-
BYTECODE.OBJ,-
PROCESS.OBJ,-
CALLPROC.OBJ,-
VMSFNS.OBJ,-
VMSPROC.OBJ,-
DOPRNT.OBJ,-
vmsmap.obj,-
termcap.obj,-
tparam.obj,-
lastfile.obj,-
alloca.obj,-
malloc.obj
collect=non_saved_data,-
stdin,-
stdout,-
stderr,-
errno,-
vaxc$errno,-
sys_errlist,-
sys_nerr,-
environ
sys$library:vaxcrtl/library