summaryrefslogtreecommitdiff
path: root/lisp/vc/vc-cvs.el
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2016-05-25 03:49:35 +0300
committerDmitry Gutov <dgutov@yandex.ru>2016-05-25 03:54:41 +0300
commit825ca2542e01879715cf9c112d0f04e849b8d863 (patch)
tree89a5583d2d9b40d5f2082a933db6205ad4a16e90 /lisp/vc/vc-cvs.el
parent4efb3e8169e8a75f3e2016c8780746785fc6b85f (diff)
downloademacs-825ca2542e01879715cf9c112d0f04e849b8d863.tar.gz
Rename vc-stay-local back to vc-cvs-stay-local
* lisp/vc/vc-cvs.el (vc-cvs-stay-local): Rename back from vc-stay-local (bug#19548). Improve the docstring. (vc-cvs-stay-local-p): Update accordingly.
Diffstat (limited to 'lisp/vc/vc-cvs.el')
-rw-r--r--lisp/vc/vc-cvs.el15
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 2dca708dc38..a2499a2294b 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -121,7 +121,7 @@ This is only meaningful if you don't use the implicit checkout model
:version "21.1"
:group 'vc-cvs)
-(defcustom vc-stay-local 'only-file
+(defcustom vc-cvs-stay-local 'only-file
"Non-nil means use local operations when possible for remote repositories.
This avoids slow queries over the network and instead uses heuristics
and past information to determine the current status of a file.
@@ -131,11 +131,11 @@ server, but heuristics will be used to determine the status for
all other VC operations.
The value can also be a regular expression or list of regular
-expressions to match against the host name of a repository; then VC
-only stays local for hosts that match it. Alternatively, the value
-can be a list of regular expressions where the first element is the
-symbol `except'; then VC always stays local except for hosts matched
-by these regular expressions."
+expressions to match against the host name of a repository; then
+vc-cvs only stays local for hosts that match it. Alternatively,
+the value can be a list of regular expressions where the first
+element is the symbol `except'; then vc-cvs always stays local
+except for hosts matched by these regular expressions."
:type '(choice (const :tag "Always stay local" t)
(const :tag "Only for file operations" only-file)
(const :tag "Don't stay local" nil)
@@ -789,8 +789,7 @@ If FILE is a list of files, return non-nil if any of them
individually should stay local."
(if (listp file)
(delq nil (mapcar (lambda (arg) (vc-cvs-stay-local-p arg)) file))
- (let* ((sym (vc-make-backend-sym 'CVS 'stay-local))
- (stay-local (if (boundp sym) (symbol-value sym) vc-stay-local)))
+ (let ((stay-local vc-cvs-stay-local))
(if (symbolp stay-local) stay-local
(let ((dirname (if (file-directory-p file)
(directory-file-name file)