Merged from miles@gnu.org--gnu-2005 (patch 17-26, 107-116)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-107
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-108
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-109
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-110
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-112
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-113
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-114
   <no summary provided>

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-115
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-116
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-17
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-18
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-19
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-20
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-21
   More work on moving images to etc/images

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-22
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-23
   Fix errors with image-file installation

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-24
   etc/Makefile.in (install): Put gnus-tut.txt in the right place.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-25
   etc/Makefile.in (install, uninstall): Fix installed image dirs.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-26
   etc/Makefile.in (install): Create $(etcdir)/images/gnus dir.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-296

1 files changed, 3 insertions, 3 deletions

diff --git a/lisp/log-view.el b/lisp/log-view.el
index 51ca8907db8..c153cbdbb60 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -1,6 +1,6 @@
 ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output
 
-;; Copyright (C) 1999, 2000, 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2005  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: rcs sccs cvs log version-control
@@ -85,7 +85,7 @@
           "\\|SCCS/s\\.\\(.+\\):"
           "\\)\n"))
 ;; In RCS, a locked revision will look like "revision N.M\tlocked by: FOO".
-(defconst log-view-message-re "^\\(revision \\([.0-9]+\\)\\(?:\t.*\\)?\\|rev \\([0-9]+\\):  .*\\|D \\([.0-9]+\\) .*\\)$")
+(defconst log-view-message-re "^\\(revision \\([.0-9]+\\)\\(?:\t.*\\)?\\|r\\([0-9]+\\) | .* | .*\\|D \\([.0-9]+\\) .*\\)$")
 
 (defconst log-view-font-lock-keywords
   `((,log-view-file-re
@@ -206,5 +206,5 @@ were the region starts and ends."
 
 (provide 'log-view)
 
-;;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f
+;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f
 ;;; log-view.el ends here