diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-bzr.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index afa0c680a8b..5c367b49cb8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-24 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored | ||
| 4 | files. (Bug#18579) | ||
| 5 | |||
| 1 | 2014-11-23 Michael Albinus <michael.albinus@gmx.de> | 6 | 2014-11-23 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * textmodes/makeinfo.el (makeinfo-buffer): Make it work also for | 8 | * textmodes/makeinfo.el (makeinfo-buffer): Make it work also for |
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index e607f9d8d1a..66c7ac4a349 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el | |||
| @@ -983,7 +983,7 @@ stream. Standard error output is discarded." | |||
| 983 | (push (list new-name 'edited | 983 | (push (list new-name 'edited |
| 984 | (vc-bzr-create-extra-fileinfo old-name)) result))) | 984 | (vc-bzr-create-extra-fileinfo old-name)) result))) |
| 985 | ;; do nothing for non existent files | 985 | ;; do nothing for non existent files |
| 986 | ((memq translated '(not-found ignored))) | 986 | ((eq translated 'not-found)) |
| 987 | (t | 987 | (t |
| 988 | (push (list (file-relative-name | 988 | (push (list (file-relative-name |
| 989 | (buffer-substring-no-properties | 989 | (buffer-substring-no-properties |