aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-06-09 19:15:54 +0800
committerXue Fuqiao2013-06-09 19:15:54 +0800
commit8d0b26f65d9d4cf52a11a273073cd52fb1feaf13 (patch)
tree7f39c1636b11d1494acf25403c1c7b28f3536aea
parent2bc4a7255ddd60597033cffe9f9cfe93b7523373 (diff)
downloademacs-8d0b26f65d9d4cf52a11a273073cd52fb1feaf13.tar.gz
emacs-8d0b26f65d9d4cf52a11a273073cd52fb1feaf13.zip
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'.
-rw-r--r--doc/emacs/ChangeLog1
-rw-r--r--doc/emacs/vc1-xtra.texi12
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc/vc-cvs.el2
-rw-r--r--lisp/vc/vc-hooks.el2
5 files changed, 15 insertions, 8 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 31fd58f8048..9f9f7da7d82 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,6 +1,7 @@
12013-06-09 Xue Fuqiao <xfq.free@gmail.com> 12013-06-09 Xue Fuqiao <xfq.free@gmail.com>
2 2
3 * vc1-xtra.texi (Revision Tags): Add a cross reference. 3 * vc1-xtra.texi (Revision Tags): Add a cross reference.
4 (CVS Options): Fix the default value of `vc-cvs-stay-local'.
4 5
52013-06-07 Xue Fuqiao <xfq.free@gmail.com> 62013-06-07 Xue Fuqiao <xfq.free@gmail.com>
6 7
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 0b109608725..96e171855a5 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -384,12 +384,12 @@ ends that support it, including CVS@. In the following, we will talk
384only about @code{vc-cvs-stay-local}, but everything applies to 384only about @code{vc-cvs-stay-local}, but everything applies to
385@code{vc-stay-local} as well. 385@code{vc-stay-local} as well.
386 386
387 If @code{vc-cvs-stay-local} is @code{t} (the default), VC determines 387 If @code{vc-cvs-stay-local} is @code{only-file} (the default), VC
388the version control status of each file using only the entry in the 388determines the version control status of each file using only the
389local CVS subdirectory and the information returned by previous CVS 389entry in the local CVS subdirectory and the information returned by
390commands. As a consequence, if you have modified a file and somebody 390previous CVS commands. As a consequence, if you have modified a file
391else has checked in other changes, you will not be notified of the 391and somebody else has checked in other changes, you will not be
392conflict until you try to commit. 392notified of the conflict until you try to commit.
393 393
394 If you change @code{vc-cvs-stay-local} to @code{nil}, VC queries the 394 If you change @code{vc-cvs-stay-local} to @code{nil}, VC queries the
395remote repository @emph{before} it decides what to do in 395remote repository @emph{before} it decides what to do in
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7173c5cacf..a6f45a1d727 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-06-09 Xue Fuqiao <xfq.free@gmail.com>
2
3 * vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
4
5 * vc/vc-hooks.el (vc-stay-local): Doc fix.
6
12013-06-09 Aidan Gauland <aidalgol@amuri.net> 72013-06-09 Aidan Gauland <aidalgol@amuri.net>
2 8
3 * eshell/em-term.el (eshell-visual-command-p): Fix bug that caused 9 * eshell/em-term.el (eshell-visual-command-p): Fix bug that caused
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index eee896056c6..17b278d1ce4 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -115,7 +115,7 @@ This is only meaningful if you don't use the implicit checkout model
115This avoids slow queries over the network and instead uses heuristics 115This avoids slow queries over the network and instead uses heuristics
116and past information to determine the current status of a file. 116and past information to determine the current status of a file.
117 117
118If value is the symbol `only-file' `vc-dir' will connect to the 118If value is the symbol `only-file', `vc-dir' will connect to the
119server, but heuristics will be used to determine the status for 119server, but heuristics will be used to determine the status for
120all other VC operations. 120all other VC operations.
121 121
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 5c8a4515b7e..284481ee524 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -128,7 +128,7 @@ See also variable `vc-consult-headers'."
128This avoids slow queries over the network and instead uses heuristics 128This avoids slow queries over the network and instead uses heuristics
129and past information to determine the current status of a file. 129and past information to determine the current status of a file.
130 130
131If value is the symbol `only-file' `vc-dir' will connect to the 131If value is the symbol `only-file', `vc-dir' will connect to the
132server, but heuristics will be used to determine the status for 132server, but heuristics will be used to determine the status for
133all other VC operations. 133all other VC operations.
134 134