summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-bzr.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4aa8cb329db..866d101c41e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2008-04-04 Dan Nicolaescu <dann@ics.uci.edu>
+ * vc-bzr.el (vc-bzr-state): Use when instead of if.
+
* vc.el (vc-default-status-fileinfo-extra): New function.
(vc-status-mark-buffer-changed): Use it.
(vc-update-vc-status-buffer): Allow for partial updates.
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index c2a67091ec3..47abf98c32a 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -267,8 +267,8 @@ If any error occurred in running `bzr status', then return nil."
(defun vc-bzr-state (file)
(lexical-let ((result (vc-bzr-status file)))
(when (consp result)
- (if (cdr result)
- (message "Warnings in `bzr' output: %s" (cdr result)))
+ (when (cdr result)
+ (message "Warnings in `bzr' output: %s" (cdr result)))
(cdr (assq (car result)
'((added . added)
(kindchanged . edited)