# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1076114233 0
# Node ID be1da5092aa4b803682b762b4d1adf866fde67d5
# Parent  22cf96204003f8d82ca7a7a23dab565ede6174c9
(line-number-at-pos): Rename from line-at-pos.
Uses changed (what-line and vc-annotate-warp-version).

diff -r 22cf96204003 -r be1da5092aa4 lisp/simple.el
--- a/lisp/simple.el	Sat Feb 07 00:00:13 2004 +0000
+++ b/lisp/simple.el	Sat Feb 07 00:37:13 2004 +0000
@@ -499,14 +499,14 @@
   "Print the current buffer line number and narrowed line number of point."
   (interactive)
   (let ((opoint (point)) (start (point-min))
-	(n (line-at-pos)))
+	(n (line-number-at-pos)))
     (if (= start 1)
 	(message "Line %d" n)
       (save-excursion
 	(save-restriction
 	  (widen)
 	  (message "line %d (narrowed line %d)" 
-		   (+ n (line-at-pos start) -1) n))))))
+		   (+ n (line-number-at-pos start) -1) n))))))
 
 (defun count-lines (start end)
   "Return number of lines between START and END.
@@ -531,7 +531,7 @@
 		done)))
 	(- (buffer-size) (forward-line (buffer-size)))))))
 
-(defun line-at-pos (&optional pos)
+(defun line-number-at-pos (&optional pos)
   "Return (narrowed) buffer line number at position POS.
 If POS is nil, use current buffer location."
   (let ((opoint (or pos (point))) start)
diff -r 22cf96204003 -r be1da5092aa4 lisp/vc.el
--- a/lisp/vc.el	Sat Feb 07 00:00:13 2004 +0000
+++ b/lisp/vc.el	Sat Feb 07 00:37:13 2004 +0000
@@ -7,7 +7,7 @@
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 ;; Keywords: tools
 
-;; $Id: vc.el,v 1.364 2004/01/22 23:34:33 uid65624 Exp $
+;; $Id: vc.el,v 1.365 2004/01/23 11:20:55 uid65624 Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -3144,7 +3144,7 @@
 revision."
   (if (not (equal major-mode 'vc-annotate-mode))
       (message "Cannot be invoked outside of a vc annotate buffer")
-    (let* ((oldline (line-at-pos))
+    (let* ((oldline (line-number-at-pos))
 	   (revspeccopy revspec)
 	   (newrev nil))
       (cond
@@ -3176,7 +3176,7 @@
 	(switch-to-buffer (car (car (last vc-annotate-buffers))))
 	(goto-line (min oldline (progn (goto-char (point-max))
 				       (previous-line)
-				       (line-at-pos))))))))
+				       (line-number-at-pos))))))))
 
 (defun vc-annotate-car-last-cons (a-list)
   "Return car of last cons in association list A-LIST."