Mercurial > emacs

changeset 49236:8df2e5ef3962

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(log-view-message-re): The rev might be locked.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 14 Jan 2003 21:46:13 +0000
parents beca89eeabb3
children 9a2cb7cc7942
files lisp/log-view.el
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/log-view.el	Tue Jan 14 21:31:47 2003 +0000
+++ b/lisp/log-view.el	Tue Jan 14 21:46:13 2003 +0000
@@ -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