summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2003-01-14 21:46:13 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2003-01-14 21:46:13 +0000
commitebfa598e18a93281fdd8e23332b95be245ea29fb (patch)
treea441c99f11c78e56648af6c07bd1012a4b16146e /lisp
parent6035bfd789fb14022fd48eaee8d15022f4f5e749 (diff)
downloademacs-ebfa598e18a93281fdd8e23332b95be245ea29fb.tar.gz
(log-view-message-re): The rev might be locked.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/log-view.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 219359344fa..ac854ba5d57 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.12 2001/12/16 16:28:59 monnier Exp $
+;; Revision: $Id: log-view.el,v 1.13 2001/12/31 20:25:41 rms Exp $
;; This file is part of GNU Emacs.
@@ -46,6 +46,7 @@
'(("q" . quit-window)
("z" . kill-this-buffer)
("m" . set-mark-command)
+ ;; ("e" . cvs-mode-edit-log)
("d" . log-view-diff)
("f" . log-view-find-version)
("n" . log-view-msg-next)
@@ -84,7 +85,8 @@
"Working file: \\(.+\\)"
"\\|SCCS/s\\.\\(.+\\):"
"\\)\n"))
-(defconst log-view-message-re "^\\(revision \\([.0-9]+\\)\\|rev \\([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