diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/calendar/cal-move.el | 18 |
2 files changed, 13 insertions, 8 deletions
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 |