diff options
| author | Nick Roberts | 2009-01-30 08:35:50 +0000 |
|---|---|---|
| committer | Nick Roberts | 2009-01-30 08:35:50 +0000 |
| commit | 95541017c2c620cb109b1af26a48f4988743a005 (patch) | |
| tree | 981c4c272bedacaf9a65978f4185b25b9b177671 | |
| parent | 613e19075dc6c9565be8f7bb297aa0929195b08b (diff) | |
| download | emacs-95541017c2c620cb109b1af26a48f4988743a005.tar.gz emacs-95541017c2c620cb109b1af26a48f4988743a005.zip | |
(vc-stay-local-p): Let vc-BACKEND-stay-local take
precedence even when it's value is t.
| -rw-r--r-- | lisp/vc-hooks.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 0d482f01e91..aacb0daa1a4 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -177,8 +177,7 @@ individually should stay local." | |||
| 177 | (delq nil (mapcar 'vc-stay-local-p file)) | 177 | (delq nil (mapcar 'vc-stay-local-p file)) |
| 178 | (let* ((backend (vc-backend file)) | 178 | (let* ((backend (vc-backend file)) |
| 179 | (sym (vc-make-backend-sym backend 'stay-local)) | 179 | (sym (vc-make-backend-sym backend 'stay-local)) |
| 180 | (stay-local (if (boundp sym) (symbol-value sym) t))) | 180 | (stay-local (if (boundp sym) (symbol-value sym) vc-stay-local))) |
| 181 | (if (eq stay-local t) (setq stay-local vc-stay-local)) | ||
| 182 | (if (symbolp stay-local) stay-local | 181 | (if (symbolp stay-local) stay-local |
| 183 | (let ((dirname (if (file-directory-p file) | 182 | (let ((dirname (if (file-directory-p file) |
| 184 | (directory-file-name file) | 183 | (directory-file-name file) |