From: Glenn Morris <rgm@gnu.org>
Date: Fri, 21 Aug 2009 07:11:24 +0000 (+0000)
Subject: (calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
X-Git-Tag: emacs-pretest-23.1.90~1767
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8ab722f607b850b8dba6eb17674df18861f73d6;p=emacs.git

(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Use forward-line, not goto-line.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 304a50c6850..fbab5bc818c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-08-21  Glenn Morris  <rgm@gnu.org>
 
+	* calendar/cal-move.el (calendar-cursor-to-nearest-date)
+	(calendar-cursor-to-visible-date): Use forward-line, not goto-line.
+
 	* mail/rmail.el (rmail-obsolete): Delete custom group.
 	(rmail-pop-password, rmail-pop-password-required): Make into aliases.
 	(rmail-remote-password, rmail-remote-password-required):
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index 534e7c1ecc7..6433b71c382 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -47,7 +47,8 @@ Returns the list (month day year) giving the cursor position."
              (last (nth 2 edges))
              (right (nth 3 edges)))
         (when (< (count-lines (point-min) (point)) calendar-first-date-row)
-          (goto-line calendar-first-date-row)
+          (goto-char (point-min))
+          (forward-line (1- calendar-first-date-row))
           (move-to-column col))
         ;; The date positions are fixed and computable, but searching
         ;; is probably more flexible.  Need to consider blank days at
@@ -76,13 +77,14 @@ Returns the list (month day year) giving the cursor position."
   (let ((month (calendar-extract-month date))
         (day (calendar-extract-day date))
         (year (calendar-extract-year date)))
-    (goto-line (+ calendar-first-date-row
-                  (/ (+ day  -1
-                        (mod
-                         (- (calendar-day-of-week (list month 1 year))
-                            calendar-week-start-day)
-                         7))
-                     7)))
+    (goto-char (point-min))
+    (forward-line (+ calendar-first-date-row -1
+                     (/ (+ day -1
+                           (mod
+                            (- (calendar-day-of-week (list month 1 year))
+                               calendar-week-start-day)
+                            7))
+                        7)))
     (move-to-column (+ calendar-left-margin (1- calendar-day-digit-width)
                        (* calendar-month-width
                           (1+ (calendar-interval