aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-04-04 07:37:36 +0000
committerGlenn Morris2008-04-04 07:37:36 +0000
commitd80c2c18c1fe064185ffbab1d0fc3ad4fd7f89c5 (patch)
tree5fb1e622c0e562bb5ffffe73adada8fa043404fd
parentc2bfc7e3939cc2ab4486812175eab3b5d6a9c4c1 (diff)
downloademacs-d80c2c18c1fe064185ffbab1d0fc3ad4fd7f89c5.tar.gz
emacs-d80c2c18c1fe064185ffbab1d0fc3ad4fd7f89c5.zip
Update for cal-persia name changes.
-rw-r--r--lisp/ChangeLog101
-rw-r--r--lisp/calendar/cal-dst.el6
2 files changed, 104 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cd6097c9e2..27d8420133f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,106 @@
12008-04-04 Glenn Morris <rgm@gnu.org> 12008-04-04 Glenn Morris <rgm@gnu.org>
2 2
3 * calendar/cal-bahai.el (calendar-bahai-to-absolute): Rename
4 calendar-absolute-from-bahai. Update callers, keep old name as alias.
5
6 * calendar/cal-islam.el (calendar-islamic-leap-year-p):
7 Rename islamic-calendar-leap-year-p. Update callers.
8 (calendar-islamic-last-day-of-month):
9 Rename islamic-calendar-last-day-of-month. Update callers.
10 (calendar-islamic-day-number):
11 Rename islamic-calendar-day-number. Update callers.
12 (calendar-islamic-to-absolute): Rename
13 calendar-absolute-from-islamic. Update callers, keep old name as alias.
14 (calendar-islamic-print-date): Rename calendar-print-islamic-date.
15 Update callers, keep old name as alias.
16 (calendar-islamic-goto-date): Rename calendar-goto-islamic-date.
17 Keep old name as alias.
18 (diary-islamic-list-entries): Rename list-islamic-diary-entries.
19 Update callers, keep old name as alias.
20 (calendar-islamic-mark-date-pattern):
21 Rename mark-islamic-calendar-date-pattern. Update callers, keep old
22 name as alias.
23 (diary-islamic-insert-entry): Rename insert-islamic-diary-entry.
24 Keep old name as alias.
25 (diary-islamic-insert-monthly-entry):
26 Rename insert-monthly-islamic-diary-entry. Keep old name as alias.
27 (diary-islamic-insert-yearly-entry):
28 Rename insert-yearly-islamic-diary-entry. Keep old name as alias.
29
30 * calendar/cal-iso.el (calendar-iso-to-absolute): Rename
31 calendar-absolute-from-iso. Update callers, keep old name as alias.
32 (calendar-iso-print-date): Rename calendar-print-iso-date.
33 Update callers, keep old name as alias.
34 (calendar-iso-goto-date): Rename calendar-goto-iso-date.
35 Keep old name as alias.
36 (calendar-iso-goto-week): Rename calendar-goto-iso-week.
37 Keep old name as alias.
38
39 * calendar/cal-julian.el (calendar-julian-to-absolute): Rename
40 calendar-absolute-from-julian. Update callers, keep old name as alias.
41 (calendar-julian-print-date): Rename calendar-print-julian-date.
42 Update callers, keep old name as alias.
43 (calendar-julian-goto-date): Rename calendar-goto-julian-date.
44 Update callers, keep old name as alias.
45 (calendar-astro-to-absolute): Rename calendar-absolute-from-astro.
46 Update callers, keep old name as alias.
47 (calendar-astro-print-day-number): Rename
48 calendar-print-astro-day-number. Update callers, keep old name as
49 alias.
50 (calendar-astro-goto-day-number): Rename calendar-goto-astro-day-number.
51 Update callers, keep old name as alias.
52
53 * calendar/cal-mayan.el (calendar-mayan-string-from-long-count):
54 Rename calendar-string-to-mayan-long-count. Update callers.
55 (calendar-mayan-print-date): Rename calendar-print-mayan-date.
56 Update callers, keep old name as alias.
57 (calendar-mayan-read-haab-date): Rename calendar-read-mayan-haab-date.
58 Update callers.
59 (calendar-mayan-read-tzolkin-date): Rename
60 calendar-read-mayan-tzolkin-date. Update callers.
61 (calendar-mayan-next-haab-date): Rename calendar-next-haab-date.
62 Keep old name as alias.
63 (calendar-mayan-previous-haab-date): Rename calendar-previous-haab-date.
64 Keep old name as alias.
65 (calendar-mayan-next-tzolkin-date): Rename calendar-next-tzolkin-date.
66 Keep old name as alias.
67 (calendar-mayan-previous-tzolkin-date): Rename
68 calendar-previous-tzolkin-date. Keep old name as alias.
69 (calendar-mayan-next-round-date): Rename
70 calendar-next-calendar-round-date. Keep old name as alias.
71 (calendar-mayan-previous-round-date): Rename
72 calendar-previous-calendar-round-date. Keep old name as alias.
73 (calendar-mayan-long-count-to-absolute): Rename
74 calendar-absolute-from-mayan-long-count. Keep old name as alias.
75 (calendar-mayan-goto-long-count-date): Rename
76 calendar-goto-mayan-long-count-date. Keep old name as alias.
77
78 * calendar/cal-persia.el (calendar-persian-month-name-array):
79 Rename persian-calendar-month-name-array. Update callers.
80 (calendar-persian-epoch): Rename persian-calendar-epoch.
81 Update callers.
82 (calendar-persian-leap-year-p): Rename persian-calendar-leap-year-p.
83 Update callers.
84 (calendar-persian-last-day-of-month): Rename
85 persian-calendar-last-day-of-month. Update callers.
86 (calendar-persian-to-absolute): Rename calendar-absolute-from-persian.
87 Update callers, keep old name as alias.
88 (calendar-persian-print-date): Rename calendar-print-persian-date.
89 Update callers, keep old name as alias.
90 (calendar-persian-goto-date): Rename calendar-goto-persian-date.
91 Keep old name as alias.
92
93 * calendar/cal-china.el, calendar/cal-coptic.el, calendar/cal-islam.el:
94 * calendar/cal-persia.el, calendar/holidays.el, calendar/lunar.el:
95 * calendar/solar.el: Update for cal-julian name changes.
96
97 * calendar/cal-dst.el: Update for persian name changes.
98
99 * calendar/cal-menu.el, calendar/calendar.el:
100 Update for islamic, iso, julian, mayan, persian name changes.
101
102 * calendar/diary-lib.el: Update for islamic name changes.
103
3 * calendar/calendar.el (calendar-hebrew-all-holidays-flag): 104 * calendar/calendar.el (calendar-hebrew-all-holidays-flag):
4 Rename all-hebrew-calendar-holidays. Update callers, keep old name 105 Rename all-hebrew-calendar-holidays. Update callers, keep old name
5 as alias. 106 as alias.
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index ac86b9e92c3..57aa87c3a80 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -181,7 +181,7 @@ Return nil if no such transition can be found."
181 (setq lo probe))) 181 (setq lo probe)))
182 hi)))) 182 hi))))
183 183
184(autoload 'calendar-absolute-from-persian "cal-persia") 184(autoload 'calendar-persian-to-absolute "cal-persia")
185 185
186(defun calendar-time-zone-daylight-rules (abs-date utc-diff) 186(defun calendar-time-zone-daylight-rules (abs-date utc-diff)
187 "Return daylight transition rule for ABS-DATE, UTC-DIFF sec offset from UTC. 187 "Return daylight transition rule for ABS-DATE, UTC-DIFF sec offset from UTC.
@@ -214,10 +214,10 @@ The result has the proper form for `calendar-daylight-savings-starts'."
214 ;; FIXME what does the Persian calendar have to do with this? 214 ;; FIXME what does the Persian calendar have to do with this?
215 (if (and (= m 3) (<= 20 d) (<= d 21)) 215 (if (and (= m 3) (<= 20 d) (<= d 21))
216 '((calendar-gregorian-from-absolute 216 '((calendar-gregorian-from-absolute
217 (calendar-absolute-from-persian `(1 1 ,(- year 621)))))) 217 (calendar-persian-to-absolute `(1 1 ,(- year 621))))))
218 (if (and (= m 9) (<= 22 d) (<= d 23)) 218 (if (and (= m 9) (<= 22 d) (<= d 23))
219 '((calendar-gregorian-from-absolute 219 '((calendar-gregorian-from-absolute
220 (calendar-absolute-from-persian `(7 1 ,(- year 621)))))))) 220 (calendar-persian-to-absolute `(7 1 ,(- year 621))))))))
221 (prevday-sec (- -1 utc-diff)) ; last sec of previous local day 221 (prevday-sec (- -1 utc-diff)) ; last sec of previous local day
222 (year (1+ y)) 222 (year (1+ y))
223 new-rules) 223 new-rules)