[Emacs-diffs] /srv/bzr/emacs/trunk r106136: * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Ignore ignored files.

[Glenn Morris]

------------------------------------------------------------
revno: 106136
fixes bug(s): http://debbugs.gnu.org/9726
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-10-19 09:42:20 -0700
message:
  * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Ignore ignored files.
modified:
  lisp/ChangeLog
  lisp/vc/vc-bzr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-19 12:54:24 +0000
+++ b/lisp/ChangeLog    2011-10-19 16:42:20 +0000
@@ -1,3 +1,8 @@
+2011-10-19  Glenn Morris  <address@hidden>
+
+       * vc/vc-bzr.el (vc-bzr-after-dir-status):
+       Ignore ignored files.  (Bug#9726)
+
 2011-10-19  Chong Yidong  <address@hidden>
 
        Doc fix for minor modes, stating that an omitted argument enables

=== modified file 'lisp/vc/vc-bzr.el'
--- a/lisp/vc/vc-bzr.el 2011-09-18 20:43:20 +0000
+++ b/lisp/vc/vc-bzr.el 2011-10-19 16:42:20 +0000
@@ -866,7 +866,7 @@
                       (" 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 @@
               (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