Mercurial > emacs
view doc/lispref/book-spine.texinfo @ 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 | 718f78440e53 |
children | 3c8bf306e5f9 |
line wrap: on
line source
\input texinfo @c -*-texinfo-*- @c %**start of header @setfilename book-spine @settitle book-spine @c %**end of header @c need dot in text so first space command works! . @sp 7 @center @titlefont{GNU Emacs Lisp Reference Manual} @sp 5 @center GNU @center Emacs Version 22.1 @center for Unix Users @sp 5 @center by @center Bil Lewis, @center Dan LaLiberte, @center and the @center GNU Manual Group @sp 5 @center Free Software Foundation @bye @ignore arch-tag: 4466c7ca-e549-4119-948c-6eed34e1ff87 @end ignore