procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor doc fix.

Browse source 
* 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'.
This commit is contained in:
Xue Fuqiao 2013-06-09 19:15:54 +08:00
parent 2bc4a7255d
commit 8d0b26f65d
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/emacs/ChangeLog
View file

@ -1,6 +1,7 @@
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>

12
doc/emacs/vc1-xtra.texi
View file

@ -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

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
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

2
lisp/vc/vc-cvs.el
View file

@ -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.

2
lisp/vc/vc-hooks.el
View file

@ -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.