Mercurial > emacs
annotate lisp/calendar/cal-move.el @ 106717:15eb515afd85
* net/browse-url.el (browse-url-encode-url): Don't escape commas.
They are valid characters in URL paths (rfc3986), and at least
Firefox does not understand the encoded version (Bug#3166).
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 02 Jan 2010 15:14:54 -0500 |
parents | bc2e79adb401 |
children | 1d1d5d9bd884 |
rev | line source |
---|---|
13053 | 1 ;;; cal-move.el --- calendar functions for movement in the calendar |
2 | |
100908 | 3 ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
67465
a55ee709ec8d
Update copyright pending Emacs 22.
Glenn Morris <rgm@gnu.org>
parents:
65919
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
13053 | 5 |
6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> | |
65919
5c09efcfc1d9
Update maintainer email address.
Glenn Morris <rgm@gnu.org>
parents:
64085
diff
changeset
|
7 ;; Maintainer: Glenn Morris <rgm@gnu.org> |
13053 | 8 ;; Keywords: calendar |
9 ;; Human-Keywords: calendar | |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94312
diff
changeset
|
13 ;; GNU Emacs is free software: you can redistribute it and/or modify |
13053 | 14 ;; it under the terms of the GNU General Public License as published by |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94312
diff
changeset
|
15 ;; the Free Software Foundation, either version 3 of the License, or |
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94312
diff
changeset
|
16 ;; (at your option) any later version. |
13053 | 17 |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94312
diff
changeset
|
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
13053 | 25 |
26 ;;; Commentary: | |
27 | |
93486
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
28 ;; See calendar.el. |
13053 | 29 |
30 ;;; Code: | |
31 | |
96159
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
32 ;; FIXME should calendar just require this? |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
33 (require 'calendar) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
34 |
96296
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
35 |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
36 ;; Note that this is not really the "closest" date. |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
37 ;; In most cases, it just searches forwards for the next day. |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
38 ;;;###cal-autoload |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
39 (defun calendar-cursor-to-nearest-date () |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
40 "Move the cursor to the closest date. |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
41 The position of the cursor is unchanged if it is already on a date. |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
42 Returns the list (month day year) giving the cursor position." |
93329
6139daabcf5f
(calendar-cursor-to-nearest-date): Remove un-needed local `date'.
Glenn Morris <rgm@gnu.org>
parents:
92916
diff
changeset
|
43 (or (calendar-cursor-to-date) |
96296
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
44 (let* ((col (current-column)) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
45 (edges (cdr (assoc (calendar-column-to-segment) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
46 calendar-month-edges))) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
47 (last (nth 2 edges)) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
48 (right (nth 3 edges))) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
49 (when (< (count-lines (point-min) (point)) calendar-first-date-row) |
104385
bc2e79adb401
(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Glenn Morris <rgm@gnu.org>
parents:
103269
diff
changeset
|
50 (goto-char (point-min)) |
bc2e79adb401
(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Glenn Morris <rgm@gnu.org>
parents:
103269
diff
changeset
|
51 (forward-line (1- calendar-first-date-row)) |
96296
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
52 (move-to-column col)) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
53 ;; The date positions are fixed and computable, but searching |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
54 ;; is probably more flexible. Need to consider blank days at |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
55 ;; start and end of month if computing positions. |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
56 ;; 'date text-property is used to exclude intermonth text. |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
57 (unless (and (looking-at "[0-9]") |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
58 (get-text-property (point) 'date)) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
59 ;; We search forwards for a number, except close to the RH |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
60 ;; margin of a month, where we search backwards. |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
61 ;; Note that the searches can go to other lines. |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
62 (if (or (looking-at " *$") |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
63 (and (> col last) (< col right))) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
64 (while (and (re-search-backward "[0-9]" nil t) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
65 (not (get-text-property (point) 'date)))) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
66 (while (and (re-search-forward "[0-9]" nil t) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
67 (not (get-text-property (1- (point)) 'date)))) |
e8b908e44add
(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
Glenn Morris <rgm@gnu.org>
parents:
96159
diff
changeset
|
68 (backward-char 1))) |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
69 (calendar-cursor-to-date)))) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
70 |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
71 (defvar displayed-month) ; from calendar-generate |
52112
e7d0572ccca5
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
31670
diff
changeset
|
72 (defvar displayed-year) |
e7d0572ccca5
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
31670
diff
changeset
|
73 |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
74 ;;;###cal-autoload |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
75 (defun calendar-cursor-to-visible-date (date) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
76 "Move the cursor to DATE that is on the screen." |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
77 (let ((month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
78 (day (calendar-extract-day date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
79 (year (calendar-extract-year date))) |
104385
bc2e79adb401
(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Glenn Morris <rgm@gnu.org>
parents:
103269
diff
changeset
|
80 (goto-char (point-min)) |
bc2e79adb401
(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Glenn Morris <rgm@gnu.org>
parents:
103269
diff
changeset
|
81 (forward-line (+ calendar-first-date-row -1 |
bc2e79adb401
(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Glenn Morris <rgm@gnu.org>
parents:
103269
diff
changeset
|
82 (/ (+ day -1 |
bc2e79adb401
(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Glenn Morris <rgm@gnu.org>
parents:
103269
diff
changeset
|
83 (mod |
bc2e79adb401
(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Glenn Morris <rgm@gnu.org>
parents:
103269
diff
changeset
|
84 (- (calendar-day-of-week (list month 1 year)) |
bc2e79adb401
(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Glenn Morris <rgm@gnu.org>
parents:
103269
diff
changeset
|
85 calendar-week-start-day) |
bc2e79adb401
(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Glenn Morris <rgm@gnu.org>
parents:
103269
diff
changeset
|
86 7)) |
bc2e79adb401
(calendar-cursor-to-nearest-date, calendar-cursor-to-visible-date):
Glenn Morris <rgm@gnu.org>
parents:
103269
diff
changeset
|
87 7))) |
96159
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
88 (move-to-column (+ calendar-left-margin (1- calendar-day-digit-width) |
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
89 (* calendar-month-width |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
90 (1+ (calendar-interval |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
91 displayed-month displayed-year month year))) |
96159
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
92 (* calendar-column-width |
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
93 (mod |
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
94 (- (calendar-day-of-week date) |
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
95 calendar-week-start-day) |
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
96 7)))))) |
19892 | 97 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
98 ;;;###cal-autoload |
13053 | 99 (defun calendar-goto-today () |
100 "Reposition the calendar window so the current date is visible." | |
101 (interactive) | |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
102 (let ((today (calendar-current-date))) ; the date might have changed |
13053 | 103 (if (not (calendar-date-is-visible-p today)) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
104 (calendar-generate-window) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
105 (calendar-update-mode-line) |
25411
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
106 (calendar-cursor-to-visible-date today))) |
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
107 (run-hooks 'calendar-move-hook)) |
13053 | 108 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
109 ;;;###cal-autoload |
13053 | 110 (defun calendar-forward-month (arg) |
111 "Move the cursor forward ARG months. | |
112 Movement is backward if ARG is negative." | |
113 (interactive "p") | |
114 (calendar-cursor-to-nearest-date) | |
115 (let* ((cursor-date (calendar-cursor-to-date t)) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
116 (month (calendar-extract-month cursor-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
117 (day (calendar-extract-day cursor-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
118 (year (calendar-extract-year cursor-date)) |
93486
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
119 (last (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
120 (calendar-increment-month month year arg) |
93486
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
121 (calendar-last-day-of-month month year))) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
122 (day (min last day)) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
123 ;; Put the new month on the screen, if needed, and go to the new date. |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
124 (new-cursor-date (list month day year))) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
125 (if (not (calendar-date-is-visible-p new-cursor-date)) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
126 (calendar-other-month month year)) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
127 (calendar-cursor-to-visible-date new-cursor-date)) |
25411
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
128 (run-hooks 'calendar-move-hook)) |
13053 | 129 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
130 ;;;###cal-autoload |
13053 | 131 (defun calendar-forward-year (arg) |
132 "Move the cursor forward by ARG years. | |
133 Movement is backward if ARG is negative." | |
134 (interactive "p") | |
135 (calendar-forward-month (* 12 arg))) | |
136 | |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
137 ;;;###cal-autoload |
13053 | 138 (defun calendar-backward-month (arg) |
139 "Move the cursor backward by ARG months. | |
140 Movement is forward if ARG is negative." | |
141 (interactive "p") | |
142 (calendar-forward-month (- arg))) | |
143 | |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
144 ;;;###cal-autoload |
13053 | 145 (defun calendar-backward-year (arg) |
146 "Move the cursor backward ARG years. | |
147 Movement is forward is ARG is negative." | |
148 (interactive "p") | |
149 (calendar-forward-month (* -12 arg))) | |
150 | |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
151 ;;;###cal-autoload |
82150
0d322d300115
(calendar-scroll-left, calendar-scroll-right):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82148
diff
changeset
|
152 (defun calendar-scroll-left (&optional arg event) |
13053 | 153 "Scroll the displayed calendar left by ARG months. |
154 If ARG is negative the calendar is scrolled right. Maintains the relative | |
92634
decf6dfe9876
(calendar-scroll-left, calendar-scroll-right): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92590
diff
changeset
|
155 position of the cursor with respect to the calendar as well as possible. |
decf6dfe9876
(calendar-scroll-left, calendar-scroll-right): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92590
diff
changeset
|
156 EVENT is an event like `last-nonmenu-event'." |
82150
0d322d300115
(calendar-scroll-left, calendar-scroll-right):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82148
diff
changeset
|
157 (interactive (list (prefix-numeric-value current-prefix-arg) |
0d322d300115
(calendar-scroll-left, calendar-scroll-right):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82148
diff
changeset
|
158 last-nonmenu-event)) |
31670 | 159 (unless arg (setq arg 1)) |
82150
0d322d300115
(calendar-scroll-left, calendar-scroll-right):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82148
diff
changeset
|
160 (save-selected-window |
94312
eaaf578ce48f
(calendar-scroll-left): Handle case when event-start is nil.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
161 ;; Nil if called from menu-bar. |
eaaf578ce48f
(calendar-scroll-left): Handle case when event-start is nil.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
162 (if (setq event (event-start event)) (select-window (posn-window event))) |
82150
0d322d300115
(calendar-scroll-left, calendar-scroll-right):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82148
diff
changeset
|
163 (calendar-cursor-to-nearest-date) |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
164 (unless (zerop arg) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
165 (let ((old-date (calendar-cursor-to-date)) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
166 (today (calendar-current-date)) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
167 (month displayed-month) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
168 (year displayed-year)) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
169 (calendar-increment-month month year arg) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
170 (calendar-generate-window month year) |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
171 (calendar-cursor-to-visible-date |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
172 (cond |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
173 ((calendar-date-is-visible-p old-date) old-date) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
174 ((calendar-date-is-visible-p today) today) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
175 (t (list month 1 year)))))) |
82150
0d322d300115
(calendar-scroll-left, calendar-scroll-right):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82148
diff
changeset
|
176 (run-hooks 'calendar-move-hook))) |
13053 | 177 |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
178 (define-obsolete-function-alias |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
179 'scroll-calendar-left 'calendar-scroll-left "23.1") |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
180 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
181 ;;;###cal-autoload |
82150
0d322d300115
(calendar-scroll-left, calendar-scroll-right):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82148
diff
changeset
|
182 (defun calendar-scroll-right (&optional arg event) |
13053 | 183 "Scroll the displayed calendar window right by ARG months. |
184 If ARG is negative the calendar is scrolled left. Maintains the relative | |
92634
decf6dfe9876
(calendar-scroll-left, calendar-scroll-right): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92590
diff
changeset
|
185 position of the cursor with respect to the calendar as well as possible. |
decf6dfe9876
(calendar-scroll-left, calendar-scroll-right): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92590
diff
changeset
|
186 EVENT is an event like `last-nonmenu-event'." |
82150
0d322d300115
(calendar-scroll-left, calendar-scroll-right):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82148
diff
changeset
|
187 (interactive (list (prefix-numeric-value current-prefix-arg) |
0d322d300115
(calendar-scroll-left, calendar-scroll-right):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82148
diff
changeset
|
188 last-nonmenu-event)) |
0d322d300115
(calendar-scroll-left, calendar-scroll-right):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82148
diff
changeset
|
189 (calendar-scroll-left (- (or arg 1)) event)) |
13053 | 190 |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
191 (define-obsolete-function-alias |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
192 'scroll-calendar-right 'calendar-scroll-right "23.1") |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
193 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
194 ;;;###cal-autoload |
101085
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
195 (defun calendar-scroll-left-three-months (arg &optional event) |
13053 | 196 "Scroll the displayed calendar window left by 3*ARG months. |
197 If ARG is negative the calendar is scrolled right. Maintains the relative | |
101085
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
198 position of the cursor with respect to the calendar as well as possible. |
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
199 EVENT is an event like `last-nonmenu-event'." |
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
200 (interactive (list (prefix-numeric-value current-prefix-arg) |
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
201 last-nonmenu-event)) |
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
202 (calendar-scroll-left (* 3 arg) event)) |
13053 | 203 |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
204 (define-obsolete-function-alias 'scroll-calendar-left-three-months |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
205 'calendar-scroll-left-three-months "23.1") |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
206 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
207 ;;;###cal-autoload |
101085
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
208 (defun calendar-scroll-right-three-months (arg &optional event) |
13053 | 209 "Scroll the displayed calendar window right by 3*ARG months. |
210 If ARG is negative the calendar is scrolled left. Maintains the relative | |
101085
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
211 position of the cursor with respect to the calendar as well as possible. |
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
212 EVENT is an event like `last-nonmenu-event'." |
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
213 (interactive (list (prefix-numeric-value current-prefix-arg) |
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
214 last-nonmenu-event)) |
8d9cf977e8f5
(calendar-scroll-left-three-months, calendar-scroll-right-three-months):
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
215 (calendar-scroll-left (* -3 arg) event)) |
13053 | 216 |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
217 (define-obsolete-function-alias 'scroll-calendar-right-three-months |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
218 'calendar-scroll-right-three-months "23.1") |
13053 | 219 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
220 ;;;###cal-autoload |
13053 | 221 (defun calendar-forward-day (arg) |
222 "Move the cursor forward ARG days. | |
223 Moves backward if ARG is negative." | |
224 (interactive "p") | |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
225 (unless (zerop arg) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
226 (let* ((cursor-date (or (calendar-cursor-to-date) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
227 (progn |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
228 (if (> arg 0) (setq arg (1- arg))) |
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
229 (calendar-cursor-to-nearest-date)))) |
13053 | 230 (new-cursor-date |
231 (calendar-gregorian-from-absolute | |
232 (+ (calendar-absolute-from-gregorian cursor-date) arg))) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
233 (new-display-month (calendar-extract-month new-cursor-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
234 (new-display-year (calendar-extract-year new-cursor-date))) |
103269
9e868e938ebb
(calendar-forward-day): Fix 2008-06-21 change -
Glenn Morris <rgm@gnu.org>
parents:
101085
diff
changeset
|
235 ;; Put the new month on the screen, if needed. |
9e868e938ebb
(calendar-forward-day): Fix 2008-06-21 change -
Glenn Morris <rgm@gnu.org>
parents:
101085
diff
changeset
|
236 (unless (calendar-date-is-visible-p new-cursor-date) |
96159
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
237 ;; The next line gives smoother scrolling IMO (one month at a |
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
238 ;; time rather than two). |
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
239 (calendar-increment-month new-display-month new-display-year |
cb4a9a7913cd
(calendar-forward-day): Scroll in one month increments.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
240 (if (< arg 0) 1 -1)) |
103269
9e868e938ebb
(calendar-forward-day): Fix 2008-06-21 change -
Glenn Morris <rgm@gnu.org>
parents:
101085
diff
changeset
|
241 (calendar-other-month new-display-month new-display-year)) |
9e868e938ebb
(calendar-forward-day): Fix 2008-06-21 change -
Glenn Morris <rgm@gnu.org>
parents:
101085
diff
changeset
|
242 ;; Go to the new date. |
9e868e938ebb
(calendar-forward-day): Fix 2008-06-21 change -
Glenn Morris <rgm@gnu.org>
parents:
101085
diff
changeset
|
243 (calendar-cursor-to-visible-date new-cursor-date))) |
25411
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
244 (run-hooks 'calendar-move-hook)) |
13053 | 245 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
246 ;;;###cal-autoload |
13053 | 247 (defun calendar-backward-day (arg) |
248 "Move the cursor back ARG days. | |
249 Moves forward if ARG is negative." | |
250 (interactive "p") | |
251 (calendar-forward-day (- arg))) | |
252 | |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
253 ;;;###cal-autoload |
13053 | 254 (defun calendar-forward-week (arg) |
255 "Move the cursor forward ARG weeks. | |
256 Moves backward if ARG is negative." | |
257 (interactive "p") | |
258 (calendar-forward-day (* arg 7))) | |
259 | |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
260 ;;;###cal-autoload |
13053 | 261 (defun calendar-backward-week (arg) |
262 "Move the cursor back ARG weeks. | |
263 Moves forward if ARG is negative." | |
264 (interactive "p") | |
265 (calendar-forward-day (* arg -7))) | |
266 | |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
267 ;;;###cal-autoload |
13053 | 268 (defun calendar-beginning-of-week (arg) |
269 "Move the cursor back ARG calendar-week-start-day's." | |
270 (interactive "p") | |
271 (calendar-cursor-to-nearest-date) | |
272 (let ((day (calendar-day-of-week (calendar-cursor-to-date)))) | |
273 (calendar-backward-day | |
274 (if (= day calendar-week-start-day) | |
275 (* 7 arg) | |
276 (+ (mod (- day calendar-week-start-day) 7) | |
277 (* 7 (1- arg))))))) | |
278 | |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
279 ;;;###cal-autoload |
13053 | 280 (defun calendar-end-of-week (arg) |
281 "Move the cursor forward ARG calendar-week-start-day+6's." | |
282 (interactive "p") | |
283 (calendar-cursor-to-nearest-date) | |
284 (let ((day (calendar-day-of-week (calendar-cursor-to-date)))) | |
285 (calendar-forward-day | |
286 (if (= day (mod (1- calendar-week-start-day) 7)) | |
287 (* 7 arg) | |
288 (+ (- 6 (mod (- day calendar-week-start-day) 7)) | |
289 (* 7 (1- arg))))))) | |
290 | |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
291 ;;;###cal-autoload |
13053 | 292 (defun calendar-beginning-of-month (arg) |
293 "Move the cursor backward ARG month beginnings." | |
294 (interactive "p") | |
295 (calendar-cursor-to-nearest-date) | |
296 (let* ((date (calendar-cursor-to-date)) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
297 (month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
298 (day (calendar-extract-day date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
299 (year (calendar-extract-year date))) |
13053 | 300 (if (= day 1) |
301 (calendar-backward-month arg) | |
302 (calendar-cursor-to-visible-date (list month 1 year)) | |
303 (calendar-backward-month (1- arg))))) | |
304 | |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
305 ;;;###cal-autoload |
13053 | 306 (defun calendar-end-of-month (arg) |
307 "Move the cursor forward ARG month ends." | |
308 (interactive "p") | |
309 (calendar-cursor-to-nearest-date) | |
310 (let* ((date (calendar-cursor-to-date)) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
311 (month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
312 (day (calendar-extract-day date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
313 (year (calendar-extract-year date)) |
93486
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
314 (last-day (calendar-last-day-of-month month year)) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
315 (last-day (progn |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
316 (unless (= day last-day) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
317 (calendar-cursor-to-visible-date |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
318 (list month last-day year)) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
319 (setq arg (1- arg))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
320 (calendar-increment-month month year arg) |
93486
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
321 (list month |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
322 (calendar-last-day-of-month month year) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
323 year)))) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
324 (if (not (calendar-date-is-visible-p last-day)) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
325 (calendar-other-month month year) |
b9615f927009
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93329
diff
changeset
|
326 (calendar-cursor-to-visible-date last-day))) |
25411
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
327 (run-hooks 'calendar-move-hook)) |
13053 | 328 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
329 ;;;###cal-autoload |
13053 | 330 (defun calendar-beginning-of-year (arg) |
331 "Move the cursor backward ARG year beginnings." | |
332 (interactive "p") | |
333 (calendar-cursor-to-nearest-date) | |
334 (let* ((date (calendar-cursor-to-date)) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
335 (month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
336 (day (calendar-extract-day date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
337 (year (calendar-extract-year date)) |
25411
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
338 (jan-first (list 1 1 year)) |
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
339 (calendar-move-hook nil)) |
13053 | 340 (if (and (= day 1) (= 1 month)) |
341 (calendar-backward-month (* 12 arg)) | |
342 (if (and (= arg 1) | |
343 (calendar-date-is-visible-p jan-first)) | |
344 (calendar-cursor-to-visible-date jan-first) | |
60981
669da3d2cff9
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
345 (calendar-other-month 1 (- year (1- arg))) |
669da3d2cff9
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
346 (calendar-cursor-to-visible-date (list 1 1 displayed-year))))) |
25411
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
347 (run-hooks 'calendar-move-hook)) |
13053 | 348 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
349 ;;;###cal-autoload |
13053 | 350 (defun calendar-end-of-year (arg) |
351 "Move the cursor forward ARG year beginnings." | |
352 (interactive "p") | |
353 (calendar-cursor-to-nearest-date) | |
354 (let* ((date (calendar-cursor-to-date)) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
355 (month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
356 (day (calendar-extract-day date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
357 (year (calendar-extract-year date)) |
25411
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
358 (dec-31 (list 12 31 year)) |
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
359 (calendar-move-hook nil)) |
13053 | 360 (if (and (= day 31) (= 12 month)) |
361 (calendar-forward-month (* 12 arg)) | |
362 (if (and (= arg 1) | |
363 (calendar-date-is-visible-p dec-31)) | |
364 (calendar-cursor-to-visible-date dec-31) | |
60981
669da3d2cff9
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
365 (calendar-other-month 12 (+ year (1- arg))) |
25411
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
366 (calendar-cursor-to-visible-date (list 12 31 displayed-year))))) |
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
367 (run-hooks 'calendar-move-hook)) |
13053 | 368 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
369 ;;;###cal-autoload |
13053 | 370 (defun calendar-goto-date (date) |
371 "Move cursor to DATE." | |
372 (interactive (list (calendar-read-date))) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
373 (let ((month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93486
diff
changeset
|
374 (year (calendar-extract-year date))) |
13053 | 375 (if (not (calendar-date-is-visible-p date)) |
376 (calendar-other-month | |
377 (if (and (= month 1) (= year 1)) | |
378 2 | |
379 month) | |
380 year))) | |
25411
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
381 (calendar-cursor-to-visible-date date) |
0d68ae69cd8c
Call the new hook in every movement function.
Richard M. Stallman <rms@gnu.org>
parents:
24337
diff
changeset
|
382 (run-hooks 'calendar-move-hook)) |
13053 | 383 |
92836
e4347538b00b
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92634
diff
changeset
|
384 ;;;###cal-autoload |
52231
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
385 (defun calendar-goto-day-of-year (year day &optional noecho) |
92916
f296fd96bd7c
(calendar-cursor-to-nearest-date): Use or, when. Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
92855
diff
changeset
|
386 "Move cursor to YEAR, DAY number; echo DAY/YEAR unless NOECHO is non-nil. |
52231
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
387 Negative DAY counts backward from end of year." |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
388 (interactive |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
389 (let* ((year (calendar-read |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
390 "Year (>0): " |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
391 (lambda (x) (> x 0)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
392 (number-to-string (calendar-extract-year |
52231
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
393 (calendar-current-date))))) |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
394 (last (if (calendar-leap-year-p year) 366 365)) |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
395 (day (calendar-read |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
396 (format "Day number (+/- 1-%d): " last) |
92590
8ef3d5355402
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
397 (lambda (x) (and (<= 1 (abs x)) (<= (abs x) last)))))) |
52231
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
398 (list year day))) |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
399 (calendar-goto-date |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
400 (calendar-gregorian-from-absolute |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
401 (if (< 0 day) |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
402 (+ -1 day (calendar-absolute-from-gregorian (list 1 1 year))) |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
403 (+ 1 day (calendar-absolute-from-gregorian (list 12 31 year)))))) |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
404 (or noecho (calendar-print-day-of-year))) |
9529ff0804c2
Edward M. Reingold <reingold@emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
52112
diff
changeset
|
405 |
13053 | 406 (provide 'cal-move) |
407 | |
82148
d979cb10446a
(calendar-scroll-left, calendar-scroll-right, calendar-scroll-left-three-months)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
408 ;; arch-tag: d0883c46-7e16-4914-8ff8-8f67e699b781 |
13053 | 409 ;;; cal-move.el ends here |