diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-10-19 09:42:20 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-10-19 09:42:20 -0700 |
| commit | 13754b5435db15ac235e4637ca91c7447c151a5b (patch) | |
| tree | 6c08fd958b0eb386e2a7c8d6d2fda80dbd29341a /lisp | |
| parent | 293cc56ee2e8976446e395e825cc7fdc4b1a1839 (diff) | |
| download | emacs-13754b5435db15ac235e4637ca91c7447c151a5b.tar.gz emacs-13754b5435db15ac235e4637ca91c7447c151a5b.tar.bz2 emacs-13754b5435db15ac235e4637ca91c7447c151a5b.zip | |
* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Ignore ignored files.
Fixes: debbugs:9726
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-bzr.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eec34f9d79c..5db9b8a5241 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-10-19 Glenn Morris <rgm@gnu.org> + + * vc/vc-bzr.el (vc-bzr-after-dir-status): + Ignore ignored files. (Bug#9726) + 2011-10-19 Chong Yidong <cyd@gnu.org> Doc fix for minor modes, stating that an omitted argument enables diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 3ab1caf2864..cc28db689e9 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -866,7 +866,7 @@ stream. Standard error output is discarded." (" M " . edited) ;; file text modified (" *" . edited) ;; execute bit changed (" M*" . edited) ;; text modified + execute bit changed - ;; FIXME: what about ignored files? + ("I " . ignored) (" D " . missing) ;; For conflicts, should we list the .THIS/.BASE/.OTHER? ("C " . conflict) @@ -916,7 +916,7 @@ stream. Standard error output is discarded." (push (list new-name 'edited (vc-bzr-create-extra-fileinfo old-name)) result))) ;; do nothing for non existent files - ((eq translated 'not-found)) + ((memq translated '(not-found ignored))) (t (push (list (file-relative-name (buffer-substring-no-properties |