diff options
| author | Stefan Monnier | 2006-08-17 14:53:09 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2006-08-17 14:53:09 +0000 |
| commit | bce848ed515d75ccc24c7ea54b7ac72dbba6a630 (patch) | |
| tree | d5dc81fd0cde49a3ea8a690a79e7baa5b1913767 | |
| parent | 38a52690e0d5d9f1ba1bbf9af21da50a1ce0a7c3 (diff) | |
| download | emacs-bce848ed515d75ccc24c7ea54b7ac72dbba6a630.tar.gz emacs-bce848ed515d75ccc24c7ea54b7ac72dbba6a630.zip | |
(cvs-parse-table): Accept the new `...' format for removed files.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/pcvs-parse.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d703ee7cbba..4234fdc3d44 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-08-17 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * pcvs-parse.el (cvs-parse-table): Accept the new `...' format for | ||
| 4 | removed files. | ||
| 5 | |||
| 1 | 2006-08-17 Nick Roberts <nickrob@snap.net.nz> | 6 | 2006-08-17 Nick Roberts <nickrob@snap.net.nz> |
| 2 | 7 | ||
| 3 | * progmodes/gdb-ui.el (gdb-locals-watch-map) | 8 | * progmodes/gdb-ui.el (gdb-locals-watch-map) |
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 0193939606c..bd493126532 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el | |||
| @@ -285,7 +285,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 285 | (and | 285 | (and |
| 286 | (cvs-or | 286 | (cvs-or |
| 287 | (cvs-match "warning: \\(.*\\) is not (any longer) pertinent$" (file 1)) | 287 | (cvs-match "warning: \\(.*\\) is not (any longer) pertinent$" (file 1)) |
| 288 | (cvs-match "\\(.*\\) is no longer in the repository$" (file 1))) | 288 | (cvs-match "`\\(.*\\)' is no longer in the repository$" (file 1)) |
| 289 | (cvs-match "\\(.*\\) is no longer in the repository$" (file 1))) | ||
| 289 | (cvs-parsed-fileinfo | 290 | (cvs-parsed-fileinfo |
| 290 | (if dont-change-disc '(NEED-UPDATE . REMOVED) 'DEAD) file)) | 291 | (if dont-change-disc '(NEED-UPDATE . REMOVED) 'DEAD) file)) |
| 291 | 292 | ||