summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Spiegel <spiegel@gnu.org>2003-01-19 07:03:18 +0000
committerAndré Spiegel <spiegel@gnu.org>2003-01-19 07:03:18 +0000
commit599ac874b534db57a485d42d248dc2c0e46ac50e (patch)
tree958cb0b3643d32b70ba6e577faa6e2b38614e2ab
parentf91032b7b46dc535d38c235ad23a5c4882276683 (diff)
downloademacs-599ac874b534db57a485d42d248dc2c0e46ac50e.tar.gz
(log-view-message-re): The rev might be locked.
-rw-r--r--lisp/log-view.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/log-view.el b/lisp/log-view.el
index e50347daa60..c827a19df50 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -4,7 +4,7 @@
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: rcs sccs cvs log version-control
-;; Revision: $Id: log-view.el,v 1.5 2000/12/06 19:49:40 fx Exp $
+;; Revision: $Id$
;; This file is part of GNU Emacs.
@@ -79,7 +79,8 @@
"Working file: \\(.+\\)"
"\\|SCCS/s\\.\\(.+\\):"
"\\)\n"))
-(defconst log-view-message-re "^\\(revision \\([.0-9]+\\)\\|D \\([.0-9]+\\) .*\\)$")
+;; 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-font-lock-keywords
`((,log-view-file-re
@@ -170,7 +171,10 @@
(provide 'log-view)
;;; Change Log:
-;; $Log: log-view.el,v $
+;; $Log$
+;; Revision 1.6 2000/12/18 03:17:31 monnier
+;; Remove useless Version.
+;;
;; Revision 1.5 2000/12/06 19:49:40 fx
;; Fix copyright years.
;;