aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2002-10-04 18:38:53 +0000
committerStefan Monnier2002-10-04 18:38:53 +0000
commit65cc83218fb44106bd3863f4d24f67320976e65d (patch)
tree671cb138a5cb1874740a3ef7059897b453a86404
parent27373ce1182ff73e987e3799b3cd33fff2544ba0 (diff)
downloademacs-65cc83218fb44106bd3863f4d24f67320976e65d.tar.gz
emacs-65cc83218fb44106bd3863f4d24f67320976e65d.zip
(vc-cvs-show-log-entry): Delete.
-rw-r--r--lisp/vc-cvs.el33
1 files changed, 1 insertions, 32 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 2b20613e727..b5576e9df63 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -5,7 +5,7 @@
5;; Author: FSF (see vc.el for full credits) 5;; Author: FSF (see vc.el for full credits)
6;; Maintainer: Andre Spiegel <spiegel@gnu.org> 6;; Maintainer: Andre Spiegel <spiegel@gnu.org>
7 7
8;; $Id: vc-cvs.el,v 1.41 2002/05/12 17:29:29 eliz Exp $ 8;; $Id: vc-cvs.el,v 1.42 2002/07/03 14:26:51 lektu Exp $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -537,37 +537,6 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
537 (if (and (vc-cvs-stay-local-p file) (fboundp 'start-process)) 'async 0) 537 (if (and (vc-cvs-stay-local-p file) (fboundp 'start-process)) 'async 0)
538 file "log")) 538 file "log"))
539 539
540(defun vc-cvs-show-log-entry (version)
541 (when (re-search-forward
542 ;; also match some context, for safety
543 (concat "----\nrevision " version
544 "\\(\tlocked by:.*\n\\|\n\\)date: ") nil t)
545 ;; set the display window so that
546 ;; the whole log entry is displayed
547 (let (start end lines)
548 (beginning-of-line) (forward-line -1) (setq start (point))
549 (if (not (re-search-forward "^----*\nrevision" nil t))
550 (setq end (point-max))
551 (beginning-of-line) (forward-line -1) (setq end (point)))
552 (setq lines (count-lines start end))
553 (cond
554 ;; if the global information and this log entry fit
555 ;; into the window, display from the beginning
556 ((< (count-lines (point-min) end) (window-height))
557 (goto-char (point-min))
558 (recenter 0)
559 (goto-char start))
560 ;; if the whole entry fits into the window,
561 ;; display it centered
562 ((< (1+ lines) (window-height))
563 (goto-char start)
564 (recenter (1- (- (/ (window-height) 2) (/ lines 2)))))
565 ;; otherwise (the entry is too large for the window),
566 ;; display from the start
567 (t
568 (goto-char start)
569 (recenter 0))))))
570
571(defun vc-cvs-diff (file &optional oldvers newvers) 540(defun vc-cvs-diff (file &optional oldvers newvers)
572 "Get a difference report using CVS between two versions of FILE." 541 "Get a difference report using CVS between two versions of FILE."
573 (let (options status (diff-switches-list (vc-diff-switches-list 'CVS))) 542 (let (options status (diff-switches-list (vc-diff-switches-list 'CVS)))