(cvs-parse-table): Adjust regexp for resurrections.

2 files changed, 10 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0572bddc9d2..4702a23453b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcvs-parse.el (cvs-parse-table): Adjust regexp for resurrections.
+
 2007-11-28  Glenn Morris  <rgm@gnu.org>
 
         * nxml/nxml-enc.el (xmltok-get-declared-encoding-position):
@@ -27,8 +31,8 @@
         * emacs-lisp/check-declare.el (check-declare-locate): Reflow doc.
         (check-declare-verify): Handle fset.
 
-        * emulation/edt.el (edt-user-emulation-setup): Test
-        edt-setup-user-bindings is bound before calling.
+        * emulation/edt.el (edt-user-emulation-setup):
+        Test edt-setup-user-bindings is bound before calling.
 
         * emulation/tpu-edt.el: Don't require cl when compiling.
         (tpu-emacs-search, tpu-emacs-rev-search): Declare as functions.
@@ -54,8 +58,8 @@
 
 2007-11-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
-        * progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify
-        byte compiler.
+        * progmodes/cperl-mode.el (compilation-error-regexp-alist):
+        Pacify byte compiler.
         (cperl-mode): Use with-no-warnings for setting vc-header-alist.
 
         * progmodes/idlwave.el (idlwave-shell-get-path-info)
@@ -254,8 +258,7 @@
         (calendar-absolute-from-gregorian, dst-in-effect): Declare as
         functions.
 
-        * calc/calc-help.el (Info-goto-node, Info-last): Declare as
-        functions.
+        * calc/calc-help.el (Info-goto-node, Info-last): Declare as functions.
 
         * calc/calc-lang.el (math-read-factor, math-read-expr-level):
         Declare as functions.
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index 7eb5c0b488f..61ee7b4bea2 100644
--- a/lisp/pcvs-parse.el
+++ b/lisp/pcvs-parse.el
@@ -302,7 +302,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
 
        ;; [add] this will also show up as a `U <file>'
        (and
-        (cvs-match "\\(.*\\), version \\(.*\\), resurrected$"
+        (cvs-match "`?\\(.*?\\)'?, version \\(.*\\), resurrected$"
                    (path 1) (base-rev 2))
         ;; FIXME: resurrection only brings back the original version,
         ;; not the latest on the branch, so `up-to-date' is not always