(match-string-no-properties): Use substring-no-properties.

[gnu-emacs] / lisp / log-view.el

diff --git a/lisp/log-view.el b/lisp/log-view.el
index a90146e006b5e6e049a4be97fc4c7871bb809879..a6f736d16f7923e1488ffe47f40e64d25d81f422 100644 (file)
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -4,7 +4,6 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: rcs sccs cvs log version-control
-;; Revision: $Id: log-view.el,v 1.8 2001/11/12 20:34:45 sds Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -46,7 +45,9 @@
   '(("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)
     ("p" . log-view-msg-prev)
     ("N" . log-view-file-next)
@@ -64,8 +65,8 @@
 
 (defface log-view-file-face
   '((((class color) (background light))
-     (:background "grey70" :bold t))
-    (t (:bold t)))
+     (:background "grey70" :weight bold))
+    (t (:weight bold)))
   "Face for the file header line in `log-view-mode'."
   :group 'log-view)
 (defvar log-view-file-face 'log-view-file-face)
@@ -73,7 +74,7 @@
 (defface log-view-message-face
   '((((class color) (background light))
      (:background "grey85"))
-    (t (:bold t)))
+    (t (:weight bold)))
   "Face for the message header line in `log-view-mode'."
   :group 'log-view)
 (defvar log-view-message-face 'log-view-message-face)
@@ -83,7 +84,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
@@ -101,7 +103,6 @@
 ;;;###autoload
 (define-derived-mode log-view-mode fundamental-mode "Log-View"
   "Major mode for browsing CVS log output."
-  (set-buffer-modified-p nil)
   (setq buffer-read-only t)
   (set (make-local-variable 'font-lock-defaults) log-view-font-lock-defaults)
   (set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap))
@@ -150,7 +151,7 @@
     (forward-line 1)
     (let ((pt (point)))
       (when (re-search-backward log-view-message-re nil t)
-       (let ((rev (or (match-string 2) (match-string 3))))
+       (let ((rev (or (match-string 2) (match-string 3) (match-string 4))))
          (unless (re-search-forward log-view-file-re pt t)
            rev))))))
 
@@ -174,9 +175,17 @@
          (cvs-force-command "/F"))
       (funcall f))))
 
-;;;
-;;; diff
-;;;
+(defun log-view-find-version (pos)
+  "Visit the version at point."
+  (interactive "d")
+  (save-excursion
+    (goto-char pos)
+    (switch-to-buffer (vc-find-version (log-view-current-file)
+                                       (log-view-current-tag)))))
+
+;;
+;; diff
+;;
 
 (defun log-view-diff (beg end)
   "Get the diff for several revisions.
@@ -195,39 +204,5 @@ Otherwise, get the diff between the revisions
 
 (provide 'log-view)
 
-;;; Change Log:
-;; $Log: log-view.el,v $
-;; Revision 1.8  2001/11/12 20:34:45  sds
-;; updated (C)
-;;
-;; Revision 1.7  2001/10/29 15:46:46  kai
-;; (log-view-mode-map): Bind `M-n' and `M-p', not `M n'
-;; and `M p'.
-;;
-;; 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.
-;;
-;; Revision 1.4  2000/05/21 02:12:34  monnier
-;; Fix file description.
-;; (log-view-mode-map): Unsatisfying fix for when cvs-mode-map is not
-;; available.
-;; (log-view-font-lock-keywords): Only use cvs-filename-face if present.
-;; (log-view-current-file): Only use cvs-pcl-cvs-dirchange-re if present.
-;;
-;; Revision 1.3  2000/05/10 22:22:21  monnier
-;; (log-view-goto-rev): New function for the new VC.
-;; (log-view-minor-wrap): Use mark-active.
-;;
-;; Revision 1.2  2000/03/22 01:10:09  monnier
-;; (log-view-(msg|file)-(prev|next)): Rename from
-;; log-view-*-(message|file) and use easy-mmode-define-navigation.
-;; (log-view-message-re): Match SCCS format as well.
-;; And match the revision line rather than the dashed separator line.
-;; (log-view-mode): Use the new define-derived-mode.
-;; (log-view-current-tag): Fill in with an actual implementation.
-;;
-
+;;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f
 ;;; log-view.el ends here