2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2f7f47a4b5..b1f42ad3c28 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * add-log.el (change-log-next-buffer): Handle the case where version<
+        signals an error.
+
         * mouse.el (mouse-menu-major-mode-map): New fun extracted from
         mouse-major-mode-menu.
         (mouse-menu-bar-map): New fun extracted from mouse-popup-menubar.
diff --git a/lisp/add-log.el b/lisp/add-log.el
index d73a83820a4..78077e220bd 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -820,8 +820,11 @@ file were isearch was started."
          (files (cons name (sort (file-expand-wildcards
                                   (concat name "[-.][0-9]*"))
                                  (lambda (a b)
-                                   (version< (substring b (length name))
-                                             (substring a (length name)))))))
+                                   ;; The file's extension may not have a valid
+                                   ;; version form (e.g. VC backup revisions).
+                                   (ignore-errors
+                                     (version< (substring b (length name))
+                                               (substring a (length name))))))))
          (files (if isearch-forward files (reverse files))))
     (find-file-noselect
      (if wrap