diff options
| -rw-r--r-- | lisp/ChangeLog | 15 | ||||
| -rw-r--r-- | lisp/pcvs-parse.el | 2 |
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 @@ | |||
| 1 | 2007-11-28 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * pcvs-parse.el (cvs-parse-table): Adjust regexp for resurrections. | ||
| 4 | |||
| 1 | 2007-11-28 Glenn Morris <rgm@gnu.org> | 5 | 2007-11-28 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * nxml/nxml-enc.el (xmltok-get-declared-encoding-position): | 7 | * nxml/nxml-enc.el (xmltok-get-declared-encoding-position): |
| @@ -27,8 +31,8 @@ | |||
| 27 | * emacs-lisp/check-declare.el (check-declare-locate): Reflow doc. | 31 | * emacs-lisp/check-declare.el (check-declare-locate): Reflow doc. |
| 28 | (check-declare-verify): Handle fset. | 32 | (check-declare-verify): Handle fset. |
| 29 | 33 | ||
| 30 | * emulation/edt.el (edt-user-emulation-setup): Test | 34 | * emulation/edt.el (edt-user-emulation-setup): |
| 31 | edt-setup-user-bindings is bound before calling. | 35 | Test edt-setup-user-bindings is bound before calling. |
| 32 | 36 | ||
| 33 | * emulation/tpu-edt.el: Don't require cl when compiling. | 37 | * emulation/tpu-edt.el: Don't require cl when compiling. |
| 34 | (tpu-emacs-search, tpu-emacs-rev-search): Declare as functions. | 38 | (tpu-emacs-search, tpu-emacs-rev-search): Declare as functions. |
| @@ -54,8 +58,8 @@ | |||
| 54 | 58 | ||
| 55 | 2007-11-27 Dan Nicolaescu <dann@ics.uci.edu> | 59 | 2007-11-27 Dan Nicolaescu <dann@ics.uci.edu> |
| 56 | 60 | ||
| 57 | * progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify | 61 | * progmodes/cperl-mode.el (compilation-error-regexp-alist): |
| 58 | byte compiler. | 62 | Pacify byte compiler. |
| 59 | (cperl-mode): Use with-no-warnings for setting vc-header-alist. | 63 | (cperl-mode): Use with-no-warnings for setting vc-header-alist. |
| 60 | 64 | ||
| 61 | * progmodes/idlwave.el (idlwave-shell-get-path-info) | 65 | * progmodes/idlwave.el (idlwave-shell-get-path-info) |
| @@ -254,8 +258,7 @@ | |||
| 254 | (calendar-absolute-from-gregorian, dst-in-effect): Declare as | 258 | (calendar-absolute-from-gregorian, dst-in-effect): Declare as |
| 255 | functions. | 259 | functions. |
| 256 | 260 | ||
| 257 | * calc/calc-help.el (Info-goto-node, Info-last): Declare as | 261 | * calc/calc-help.el (Info-goto-node, Info-last): Declare as functions. |
| 258 | functions. | ||
| 259 | 262 | ||
| 260 | * calc/calc-lang.el (math-read-factor, math-read-expr-level): | 263 | * calc/calc-lang.el (math-read-factor, math-read-expr-level): |
| 261 | Declare as functions. | 264 | 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'." | |||
| 302 | 302 | ||
| 303 | ;; [add] this will also show up as a `U <file>' | 303 | ;; [add] this will also show up as a `U <file>' |
| 304 | (and | 304 | (and |
| 305 | (cvs-match "\\(.*\\), version \\(.*\\), resurrected$" | 305 | (cvs-match "`?\\(.*?\\)'?, version \\(.*\\), resurrected$" |
| 306 | (path 1) (base-rev 2)) | 306 | (path 1) (base-rev 2)) |
| 307 | ;; FIXME: resurrection only brings back the original version, | 307 | ;; FIXME: resurrection only brings back the original version, |
| 308 | ;; not the latest on the branch, so `up-to-date' is not always | 308 | ;; not the latest on the branch, so `up-to-date' is not always |