diff options
| author | Dan Nicolaescu | 2009-03-20 13:56:42 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2009-03-20 13:56:42 +0000 |
| commit | 2bc9f1df7d93fba9d2e62c0d35a428edd71bb248 (patch) | |
| tree | ef324563770b265f3b0899fb7ced87a9355c90f7 | |
| parent | f761d6b6a7905bd0611b6bf12d10c8a5346b6897 (diff) | |
| download | emacs-2bc9f1df7d93fba9d2e62c0d35a428edd71bb248.tar.gz emacs-2bc9f1df7d93fba9d2e62c0d35a428edd71bb248.zip | |
(vc-dir-deduce-fileset): Make the error message more explicit.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-dir.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cbae73edfd0..9cd895c4f35 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-03-20 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-dir.el (vc-dir-deduce-fileset): Make the error message more explicit. | ||
| 4 | |||
| 1 | 2009-03-19 Juanma Barranquero <lekktu@gmail.com> | 5 | 2009-03-19 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * subr.el (forward-point): Add obsolescence declaration. | 7 | * subr.el (forward-point): Add obsolescence declaration. |
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el index d2414f9172f..4ac5ed6852a 100644 --- a/lisp/vc-dir.el +++ b/lisp/vc-dir.el | |||
| @@ -1101,7 +1101,7 @@ outside of VC) and one wants to do some operation on it." | |||
| 1101 | ;; state to decide which operation to perform. | 1101 | ;; state to decide which operation to perform. |
| 1102 | (dolist (crt (cdr only-files-list)) | 1102 | (dolist (crt (cdr only-files-list)) |
| 1103 | (unless (vc-compatible-state (cdr crt) state) | 1103 | (unless (vc-compatible-state (cdr crt) state) |
| 1104 | (error "%s:%s clashes with %s:%s" | 1104 | (error "When applying VC operations to multiple files, the files are required\nto be in similar VC states.\n%s in state %s clashes with %s in state %s" |
| 1105 | (car crt) (cdr crt) (caar only-files-list) state))) | 1105 | (car crt) (cdr crt) (caar only-files-list) state))) |
| 1106 | (setq only-files-list (mapcar 'car only-files-list)) | 1106 | (setq only-files-list (mapcar 'car only-files-list)) |
| 1107 | (when (and state (not (eq state 'unregistered))) | 1107 | (when (and state (not (eq state 'unregistered))) |