diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-04 08:34:15 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-04 08:34:15 +0000 |
| commit | b38f5e6fea9ae63f826e849b0c037d28119604c9 (patch) | |
| tree | 9b786dbab02be01515eb923897b54a91db34aa6c /lisp/vc-bzr.el | |
| parent | 896631767cce684848ebcbe72ddafdbab56d2201 (diff) | |
| download | emacs-b38f5e6fea9ae63f826e849b0c037d28119604c9.tar.gz | |
* mouse.el (mouse-popup-menubar): Fix typo.
* emacs-lisp/bytecomp.el (byte-compile-from-buffer): Move one more
form inside with-current-buffer.
* progmodes/antlr-mode.el (provide): Move to the end of file.
(require): Don't require font-lock and compile.
(outline-level, imenu-use-markers, imenu-create-index-function):
Move declarations to top level.
(cond-emacs-xemacs-macfn): Declare for compiler.
* vc-bzr.el (vc-bzr-root):
* vc-arch.el (vc-arch-root): Only set a property if the file is
managed by this backend.
* vc-hg.el (vc-hg-state): Support the new status code for
up-to-date.
Diffstat (limited to 'lisp/vc-bzr.el')
| -rw-r--r-- | lisp/vc-bzr.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 8a1c56490ac..8ec5935966a 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -118,9 +118,8 @@ Invoke the bzr command adding `BZR_PROGRESS_BAR=none' to the environment." "Return the root directory of the bzr repository containing FILE." ;; Cache technique copied from vc-arch.el. (or (vc-file-getprop file 'bzr-root) - (vc-file-setprop - file 'bzr-root - (vc-find-root file vc-bzr-admin-checkout-format-file)))) + (let ((root (vc-find-root file vc-bzr-admin-checkout-format-file))) + (when root (vc-file-setprop file 'bzr-root root))))) (defun vc-bzr-registered (file) "Return non-nil if FILE is registered with bzr. |