Commit 8d0b26f6 authored by Xue Fuqiao's avatar Xue Fuqiao
Browse files

Minor doc fix.

* lisp/vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
* lisp/vc/vc-hooks.el (vc-stay-local): Doc fix.
* doc/emacs/vc1-xtra.texi (CVS Options): Fix the default value of
  `vc-cvs-stay-local'.
parent 2bc4a725
2013-06-09 Xue Fuqiao <xfq.free@gmail.com>
* vc1-xtra.texi (Revision Tags): Add a cross reference.
(CVS Options): Fix the default value of `vc-cvs-stay-local'.
2013-06-07 Xue Fuqiao <xfq.free@gmail.com>
......
......@@ -384,12 +384,12 @@ ends that support it, including CVS@. In the following, we will talk
only about @code{vc-cvs-stay-local}, but everything applies to
@code{vc-stay-local} as well.
If @code{vc-cvs-stay-local} is @code{t} (the default), VC determines
the version control status of each file using only the entry in the
local CVS subdirectory and the information returned by previous CVS
commands. As a consequence, if you have modified a file and somebody
else has checked in other changes, you will not be notified of the
conflict until you try to commit.
If @code{vc-cvs-stay-local} is @code{only-file} (the default), VC
determines the version control status of each file using only the
entry in the local CVS subdirectory and the information returned by
previous CVS commands. As a consequence, if you have modified a file
and somebody else has checked in other changes, you will not be
notified of the conflict until you try to commit.
If you change @code{vc-cvs-stay-local} to @code{nil}, VC queries the
remote repository @emph{before} it decides what to do in
......
2013-06-09 Xue Fuqiao <xfq.free@gmail.com>
* vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
* vc/vc-hooks.el (vc-stay-local): Doc fix.
2013-06-09 Aidan Gauland <aidalgol@amuri.net>
 
* eshell/em-term.el (eshell-visual-command-p): Fix bug that caused
......@@ -115,7 +115,7 @@ This is only meaningful if you don't use the implicit checkout model
This avoids slow queries over the network and instead uses heuristics
and past information to determine the current status of a file.
If value is the symbol `only-file' `vc-dir' will connect to the
If value is the symbol `only-file', `vc-dir' will connect to the
server, but heuristics will be used to determine the status for
all other VC operations.
......
......@@ -128,7 +128,7 @@ See also variable `vc-consult-headers'."
This avoids slow queries over the network and instead uses heuristics
and past information to determine the current status of a file.
If value is the symbol `only-file' `vc-dir' will connect to the
If value is the symbol `only-file', `vc-dir' will connect to the
server, but heuristics will be used to determine the status for
all other VC operations.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment