From 4109ce02c4be8f482b4d8e58b3efc92ed0cf9aa1 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Sat, 7 Feb 2004 00:37:13 +0000 Subject: [PATCH] (line-number-at-pos): Rename from line-at-pos. Uses changed (what-line and vc-annotate-warp-version). --- lisp/simple.el | 6 +++--- lisp/vc.el | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index 23d5e2c3440..d978ecd6555 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -499,14 +499,14 @@ that uses or sets the mark." "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 @@ and the greater of them is not at the start of a line." 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 --git a/lisp/vc.el b/lisp/vc.el index a41a4808e8d..a4d941cff41 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -7,7 +7,7 @@ ;; Maintainer: Andre Spiegel ;; 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 @@ 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 (line-at-pos)) + (let* ((oldline (line-number-at-pos)) (revspeccopy revspec) (newrev nil)) (cond @@ -3176,7 +3176,7 @@ revision." (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." -- 2.39.2