diff options
| author | Dan Nicolaescu | 2008-04-04 22:29:02 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-04-04 22:29:02 +0000 |
| commit | 6efbb10c5b3062d957b935a5382cc0670d755c29 (patch) | |
| tree | e57a7ee315ece17f43cd2ed17999841ef74fb938 | |
| parent | 5a84a937140c3ec0cdf7e53e626b5dcdb74e5bc7 (diff) | |
| download | emacs-6efbb10c5b3062d957b935a5382cc0670d755c29.tar.gz emacs-6efbb10c5b3062d957b935a5382cc0670d755c29.zip | |
(vc-bzr-state): Use when instead of if.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 4 |
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 @@ | |||
| 1 | 2008-04-04 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2008-04-04 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * vc-bzr.el (vc-bzr-state): Use when instead of if. | ||
| 4 | |||
| 3 | * vc.el (vc-default-status-fileinfo-extra): New function. | 5 | * vc.el (vc-default-status-fileinfo-extra): New function. |
| 4 | (vc-status-mark-buffer-changed): Use it. | 6 | (vc-status-mark-buffer-changed): Use it. |
| 5 | (vc-update-vc-status-buffer): Allow for partial updates. | 7 | (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." | |||
| 267 | (defun vc-bzr-state (file) | 267 | (defun vc-bzr-state (file) |
| 268 | (lexical-let ((result (vc-bzr-status file))) | 268 | (lexical-let ((result (vc-bzr-status file))) |
| 269 | (when (consp result) | 269 | (when (consp result) |
| 270 | (if (cdr result) | 270 | (when (cdr result) |
| 271 | (message "Warnings in `bzr' output: %s" (cdr result))) | 271 | (message "Warnings in `bzr' output: %s" (cdr result))) |
| 272 | (cdr (assq (car result) | 272 | (cdr (assq (car result) |
| 273 | '((added . added) | 273 | '((added . added) |
| 274 | (kindchanged . edited) | 274 | (kindchanged . edited) |