Mercurial > emacs
view doc/misc/trampver.texi @ 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 | 57408ba5f8d3 |
children | bf2d011df79a |
line wrap: on
line source
@c -*-texinfo-*- @c texi/trampver.texi. Generated from trampver.texi.in by configure. @c This is part of the Emacs manual. @c Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. @set trampver 2.1.14-pre @c Other flags from configuration @set instprefix /usr/local @set lispdir /usr/local/share/emacs/site-lisp @set infodir /usr/local/share/info @c Formatting of the tramp program name consistent. @set tramp @sc{tramp} @c Whether or not describe gateway methods. @ifclear noemacsgw @set emacsgw @end ifclear @c Some flags which make the text independent on the (X)Emacs flavor. @c "emacs" resp "xemacs" are set in the Makefile. Default is "emacs". @ifclear emacs @ifclear xemacs @set emacs @end ifclear @end ifclear @c Emacs values. @ifset emacs @set emacsname GNU Emacs @set emacsdir emacs @set ftppackagename Ange-FTP @set prefix / @set prefixhop @set postfix : @set postfixhop : @set emacsothername XEmacs @set emacsotherdir xemacs @set emacsotherfilename tramp-xemacs.html @set japanesemanual tramp_ja-emacs.html @end ifset @c XEmacs counterparts. @ifset xemacs @set emacsname XEmacs @set emacsdir xemacs @set ftppackagename EFS @set prefix /[ @set prefixhop [ @set postfix ] @set postfixhop / @set emacsothername GNU Emacs @set emacsotherdir emacs @set emacsotherfilename tramp-emacs.html @set japanesemanual tramp_ja-xemacs.html @end ifset @ignore arch-tag: e0fe322c-e06b-46eb-bb5b-d091b521f41c @end ignore