From: André Spiegel <spiegel@gnu.org>
Date: Thu, 22 Jan 2004 23:34:33 +0000 (+0000)
Subject: (vc-current-line): Function removed.  This is now done by the new
X-Git-Tag: ttn-vms-21-2-B4~7850
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6b50160c2a184f4ac7cce1630e047c7861b0555;p=emacs.git

(vc-current-line): Function removed.  This is now done by the new
function line-at-pos in simple.el.
(vc-annotate-warp-version): Use line-at-pos instead of
vc-current-line.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index d8402e9c04b..faf35f57228 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 ;; Keywords: tools
 
-;; $Id: vc.el,v 1.362 2004/01/20 17:39:09 uid65624 Exp $
+;; $Id: vc.el,v 1.363 2004/01/21 11:05:51 uid65624 Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -3135,19 +3135,6 @@ versions after."
 	    (vc-version-diff vc-annotate-parent-file prev-rev rev-at-line))
 	  (switch-to-buffer "*vc-diff*"))))))
 
-(defun vc-current-line ()
-  "Return the current buffer's line number."
-  (let ((oldpoint (point)) start)
-    (save-excursion
-      (save-restriction
-	(goto-char (point-min))
-	(widen)
-	(forward-line 0)
-	(setq start (point))
-	(goto-char oldpoint)
-	(forward-line 0)
-	(1+ (count-lines (point-min) (point)))))))
-
 (defun vc-annotate-warp-version (revspec)
   "Annotate the version described by REVSPEC.
 
@@ -3159,7 +3146,7 @@ string, then it describes a revision number, so warp to that
 revision."
   (if (not (equal major-mode 'vc-annotate-mode))
       (message "Cannot be invoked outside of a vc annotate buffer")
-    (let* ((oldline (vc-current-line))
+    (let* ((oldline (line-at-pos))
 	   (revspeccopy revspec)
 	   (newrev nil))
       (cond
@@ -3191,7 +3178,7 @@ revision."
 	(switch-to-buffer (car (car (last vc-annotate-buffers))))
 	(goto-line (min oldline (progn (goto-char (point-max))
 				       (previous-line)
-				       (vc-current-line))))))))
+				       (line-at-pos))))))))
 
 (defun vc-annotate-car-last-cons (a-list)
   "Return car of last cons in association list A-LIST."