diff options
| author | Glenn Morris | 2012-09-29 16:13:29 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-09-29 16:13:29 -0700 |
| commit | 93ab178b0479ff9c7a8da3370a23eb38b18e9a27 (patch) | |
| tree | a639f76b0fecd75c0f14f1c4fe552c67df3d4b03 | |
| parent | 78819a9ff85a3c70ce1f68e0a7962b50e95bc66e (diff) | |
| download | emacs-93ab178b0479ff9c7a8da3370a23eb38b18e9a27.tar.gz emacs-93ab178b0479ff9c7a8da3370a23eb38b18e9a27.zip | |
Comments for vc-bzr, clarifying vc-bzr-registered
| -rw-r--r-- | lisp/vc/vc-bzr.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 1eb33776f6a..74a61548d8b 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el | |||
| @@ -150,12 +150,6 @@ Use the current Bzr root directory as the ROOT argument to | |||
| 150 | (defconst vc-bzr-admin-branchconf | 150 | (defconst vc-bzr-admin-branchconf |
| 151 | (concat vc-bzr-admin-dirname "/branch/branch.conf")) | 151 | (concat vc-bzr-admin-dirname "/branch/branch.conf")) |
| 152 | 152 | ||
| 153 | ;;;###autoload (defun vc-bzr-registered (file) | ||
| 154 | ;;;###autoload (if (vc-find-root file vc-bzr-admin-checkout-format-file) | ||
| 155 | ;;;###autoload (progn | ||
| 156 | ;;;###autoload (load "vc-bzr") | ||
| 157 | ;;;###autoload (vc-bzr-registered file)))) | ||
| 158 | |||
| 159 | (defun vc-bzr-root (file) | 153 | (defun vc-bzr-root (file) |
| 160 | "Return the root directory of the bzr repository containing FILE." | 154 | "Return the root directory of the bzr repository containing FILE." |
| 161 | ;; Cache technique copied from vc-arch.el. | 155 | ;; Cache technique copied from vc-arch.el. |
| @@ -291,6 +285,14 @@ in the repository root directory of FILE." | |||
| 291 | (message "Falling back on \"slow\" status detection (%S)" err) | 285 | (message "Falling back on \"slow\" status detection (%S)" err) |
| 292 | (vc-bzr-state file)))))) | 286 | (vc-bzr-state file)))))) |
| 293 | 287 | ||
| 288 | ;; This is a cheap approximation that is autoloaded. If it finds a | ||
| 289 | ;; possible match it loads this file and runs the real function. | ||
| 290 | ;; It requires vc-bzr-admin-checkout-format-file to be autoloaded too. | ||
| 291 | ;;;###autoload (defun vc-bzr-registered (file) | ||
| 292 | ;;;###autoload (if (vc-find-root file vc-bzr-admin-checkout-format-file) | ||
| 293 | ;;;###autoload (progn | ||
| 294 | ;;;###autoload (load "vc-bzr") | ||
| 295 | ;;;###autoload (vc-bzr-registered file)))) | ||
| 294 | 296 | ||
| 295 | (defun vc-bzr-registered (file) | 297 | (defun vc-bzr-registered (file) |
| 296 | "Return non-nil if FILE is registered with bzr." | 298 | "Return non-nil if FILE is registered with bzr." |