[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 cfc94fd: Don't mention 'vc-stay-local' in the use
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 cfc94fd: Don't mention 'vc-stay-local' in the user manual |
Date: |
Sat, 20 Jan 2018 07:45:56 -0500 (EST) |
branch: emacs-26
commit cfc94fd245076ee0fba49083a55b08bbadfec4eb
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Don't mention 'vc-stay-local' in the user manual
* doc/emacs/vc1-xtra.texi (CVS Options):
* doc/emacs/maintaining.texi (VC Directory Buffer): Remove
references to 'vc-stay-local', which no longer exists.
(Bug#30138)
---
doc/emacs/maintaining.texi | 8 +++-----
doc/emacs/vc1-xtra.texi | 19 +++++++------------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 0846440..cb53529 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1206,11 +1206,9 @@ file. RCS and SCCS show the name of the user locking a
file as its
status.
@ifnottex
address@hidden vc-stay-local
- On CVS and Subversion, the @code{vc-dir} command normally contacts
-the repository, which may be on a remote machine, to check for
-updates. If you change the variable @code{vc-stay-local} or
address@hidden (for CVS) to @code{nil} (@pxref{CVS
+ On CVS, the @code{vc-dir} command normally contacts the repository,
+which may be on a remote machine, to check for updates. If you change
+the variable @code{vc-cvs-stay-local} to @code{nil} (@pxref{CVS
Options}), then Emacs avoids contacting a remote repository when
generating the VC Directory buffer (it will still contact it when
necessary, e.g., when doing a commit). This may be desirable if you
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 6c4e077..7a4b8e4 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -364,18 +364,13 @@ the name of the operation to invoke.
@cindex remote repositories (CVS)
When using a CVS repository on a remote machine, VC can try keeping
network interactions to a minimum. This is controlled by the variable
address@hidden There is another variable,
address@hidden, which enables the feature also for other back
-ends that support it, including address@hidden In the following, we will talk
-only about @code{vc-cvs-stay-local}, but everything applies to
address@hidden as well.
-
- 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.
address@hidden If @code{vc-cvs-stay-local} is
address@hidden (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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 cfc94fd: Don't mention 'vc-stay-local' in the user manual,
Eli Zaretskii <=