diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 2007-10-10 18:52:45 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 2007-10-10 18:52:45 +0000 |
| commit | ac3f4c6f0213219ce488c46667a8bed6f915e71f (patch) | |
| tree | f9c3f270572da2ccd0cb9ce9786f56df0ee1ccef /lisp/vc-bzr.el | |
| parent | ed4e8e8a4b9eeb73a54e686dc2264c635d2416e3 (diff) | |
| download | emacs-ac3f4c6f0213219ce488c46667a8bed6f915e71f.tar.gz | |
Terminology cleanup.
Diffstat (limited to 'lisp/vc-bzr.el')
| -rw-r--r-- | lisp/vc-bzr.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 18abed00939..e889ea86c1e 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -238,7 +238,7 @@ If any error occurred in running `bzr status', then return nil." (defun vc-bzr-workfile-unchanged-p (file) (eq 'unchanged (car (vc-bzr-status file)))) -(defun vc-bzr-workfile-version (file) +(defun vc-bzr-working-revision (file) (lexical-let* ((rootdir (vc-bzr-root file)) (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file @@ -377,7 +377,7 @@ EDITABLE is ignored." (defun vc-bzr-diff (files &optional rev1 rev2 buffer) "VC bzr backend for diff." - (let ((working (vc-workfile-version (if (consp files) (car files) files)))) + (let ((working (vc-working-revision (if (consp files) (car files) files)))) (if (and (equal rev1 working) (not rev2)) (setq rev1 nil)) (if (and (not rev1) rev2) @@ -546,7 +546,7 @@ Optional argument LOCALP is always ignored." (vc-file-setprop file 'vc-state current-vc-state) (vc-file-setprop file 'vc-bzr-state current-bzr-state) (when (eq 'added current-bzr-state) - (vc-file-setprop file 'vc-workfile-version "0")))) + (vc-file-setprop file 'vc-working-revision "0")))) (when (eq 'not-versioned current-bzr-state) (let ((file (expand-file-name (buffer-substring-no-properties |