From 06bfc9822af39c7a7720bc7349d52c7a45fc0909 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 5 Apr 2008 19:16:40 +0000 Subject: [PATCH] Update for coptic and french name changes. --- lisp/ChangeLog | 54 +++++++++++++++++++++++++++++++++++++++ lisp/calendar/cal-menu.el | 6 ++--- lisp/calendar/calendar.el | 12 ++++----- 3 files changed, 63 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 14fb413f41a..d80057d3c78 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -15,6 +15,60 @@ * calendar/cal-x.el (calendar-dedicate-diary): Use get-buffer rather than buffer-live-p. Reported by David Koppelman . + * calendar/cal-coptic.el (calendar-coptic-month-name-array): + Rename coptic-calendar-month-name-array. Update callers. + (calendar-coptic-epoch): Rename coptic-calendar-epoch. Update callers. + (calendar-coptic-name): Rename coptic-name. Update callers. + (calendar-coptic-leap-year-p): Rename coptic-calendar-leap-year-p. + Update callers. + (calendar-coptic-last-day-of-month): Rename + coptic-calendar-last-day-of-month. Update callers. + (calendar-coptic-to-absolute): Rename calendar-absolute-from-coptic. + Keep old name as alias, update callers. + (calendar-coptic-print-date): Rename calendar-print-coptic-date. + Keep old name as alias, update callers. + (calendar-coptic-goto-date): Rename calendar-goto-coptic-date. + Keep old name as alias. + (calendar-ethiopic-month-name-array): Rename + ethiopic-calendar-month-name-array. Update callers. + (calendar-ethiopic-epoch): Rename ethiopic-calendar-epoch. + Update callers. + (calendar-ethiopic-name): Rename ethiopic-name. Update callers. + (calendar-ethiopic-to-absolute): Rename calendar-absolute-from-ethiopic. + Keep old name as alias, update callers. + (calendar-ethiopic-print-date): Rename calendar-print-ethiopic-date. + Keep old name as alias, update callers. + (calendar-ethiopic-goto-date): Rename calendar-goto-ethiopic-date. + Keep old name as alias. + + * calendar/cal-french.el (calendar-french-epoch): Rename + french-calendar-epoch. Update callers. + (calendar-french-month-name-array): Rename variable and function + french-calendar-month-name-array. Update callers. + (calendar-french-multibyte-month-name-array): Rename + french-calendar-multibyte-month-name-array. Update callers. + (calendar-french-day-name-array): Rename variable and function + french-calendar-day-name-array. Update callers. + (calendar-french-special-days-array): Rename variable and function + french-calendar-special-days-array. Update callers. + (calendar-french-multibyte-special-days-array): Rename + french-calendar-multibyte-special-days-array. Update callers. + (calendar-french-accents-p): Rename french-calendar-accents. + Update callers. + (calendar-french-leap-year-p): Rename french-calendar-leap-year-p. + Update callers. + (calendar-french-last-day-of-month): Rename + french-calendar-last-day-of-month. Update callers. + (calendar-french-to-absolute): Rename calendar-absolute-from-french. + Keep old name as alias, update callers. + (calendar-french-print-date): Rename calendar-print-french-date. + Keep old name as alias, update callers. + (calendar-french-goto-date): Rename calendar-goto-french-date. + Keep old name as alias. + + * calendar/cal-menu.el, calendar/calendar.el: + Update for coptic and french name changes. + 2008-04-05 Stefan Monnier * server.el: Undo part of the multi-tty change, which is only diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el index c8f22596a7c..d872ba8b8ed 100644 --- a/lisp/calendar/cal-menu.el +++ b/lisp/calendar/cal-menu.el @@ -130,8 +130,8 @@ ["Islamic Date" calendar-islamic-goto-date] ["Julian Date" calendar-julian-goto-date] ["Chinese Date" calendar-goto-chinese-date] - ["Coptic Date" calendar-goto-coptic-date] - ["Ethiopic Date" calendar-goto-ethiopic-date] + ["Coptic Date" calendar-coptic-goto-date] + ["Ethiopic Date" calendar-ethiopic-goto-date] ("Mayan Date" ["Next Tzolkin" calendar-mayan-next-tzolkin-date] ["Previous Tzolkin" calendar-mayan-previous-tzolkin-date] @@ -139,7 +139,7 @@ ["Previous Haab" calendar-mayan-previous-haab-date] ["Next Round" calendar-mayan-next-round-date] ["Previous Round" calendar-mayan-previous-round-date]) - ["French Date" calendar-goto-french-date])) + ["French Date" calendar-french-goto-date])) (defconst cal-menu-scroll-menu '("Scroll" diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 0ec489f80ca..72a70cddf6d 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1602,12 +1602,12 @@ after the inserted text. Returns t." (define-key map "gi" 'calendar-islamic-goto-date) (define-key map "gb" 'calendar-bahai-goto-date) (define-key map "gC" 'calendar-goto-chinese-date) - (define-key map "gk" 'calendar-goto-coptic-date) - (define-key map "ge" 'calendar-goto-ethiopic-date) + (define-key map "gk" 'calendar-coptic-goto-date) + (define-key map "ge" 'calendar-ethiopic-goto-date) (define-key map "gp" 'calendar-persian-goto-date) (define-key map "gc" 'calendar-iso-goto-date) (define-key map "gw" 'calendar-iso-goto-week) - (define-key map "gf" 'calendar-goto-french-date) + (define-key map "gf" 'calendar-french-goto-date) (define-key map "gml" 'calendar-mayan-goto-long-count-date) (define-key map "gmpc" 'calendar-mayan-previous-round-date) (define-key map "gmnc" 'calendar-mayan-next-round-date) @@ -1635,8 +1635,8 @@ after the inserted text. Returns t." (define-key map "s" 'diary-show-all-entries) (define-key map "pd" 'calendar-print-day-of-year) (define-key map "pC" 'calendar-print-chinese-date) - (define-key map "pk" 'calendar-print-coptic-date) - (define-key map "pe" 'calendar-print-ethiopic-date) + (define-key map "pk" 'calendar-coptic-print-date) + (define-key map "pe" 'calendar-ethiopic-print-date) (define-key map "pp" 'calendar-persian-print-date) (define-key map "pc" 'calendar-iso-print-date) (define-key map "pj" 'calendar-julian-print-date) @@ -1644,7 +1644,7 @@ after the inserted text. Returns t." (define-key map "ph" 'calendar-print-hebrew-date) (define-key map "pi" 'calendar-islamic-print-date) (define-key map "pb" 'calendar-bahai-print-date) - (define-key map "pf" 'calendar-print-french-date) + (define-key map "pf" 'calendar-french-print-date) (define-key map "pm" 'calendar-mayan-print-date) (define-key map "po" 'calendar-print-other-dates) (define-key map "id" 'insert-diary-entry) -- 2.39.2