mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

Add references to Persian calendar.

Browse Source
This commit is contained in:
Edward M. Reingold 1996-03-29 17:47:01 +00:00
parent 0e41f190eb
commit c21eb13de8
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/calendar/cal-menu.el
View File

@ -112,6 +112,8 @@
'("Julian Date" . calendar-goto-julian-date))
(define-key calendar-mode-map [menu-bar goto islamic]
'("Islamic Date" . calendar-goto-islamic-date))
(define-key calendar-mode-map [menu-bar goto persian]
'("Persian Date" . calendar-goto-persian-date))
(define-key calendar-mode-map [menu-bar goto hebrew]
'("Hebrew Date" . calendar-goto-hebrew-date))
(define-key calendar-mode-map [menu-bar goto astro]
@ -395,7 +397,9 @@ The output is in landscape format, one month to a page."
(format "Astronomical (Julian) day number (after noon UTC): %s"
(calendar-astro-date-string date)))
(list (format "Hebrew date (before sunset): %s"
(calendar-hebrew-date-string date))))
(calendar-hebrew-date-string date)))
(list (format "Persian date: %s"
(calendar-persian-date-string date))))
(let ((i (calendar-islamic-date-string date)))
(if (not (string-equal i ""))
(list (list (format "Islamic date (before sunset): %s" i)))))

21
lisp/calendar/calendar.el
View File

@ -61,6 +61,7 @@
;; cal-mayan.el Mayan calendars
;; cal-menu.el Menu support
;; cal-move.el Movement in the calendar
;; cal-persian.el Perisan calendar
;; cal-tex.el Calendars in LaTeX
;; cal-x.el X-windows dedicated frame functions
;; diary.el Diary functions
@ -335,9 +336,9 @@ causes the diary entry \"Vacation\" to appear from November 1 through November
`diary-cyclic', `diary-day-of-year', `diary-iso-date', `diary-french-date',
`diary-hebrew-date', `diary-islamic-date', `diary-mayan-date',
`diary-chinese-date', `diary-coptic-date', `diary-ethiopic-date',
`diary-yahrzeit', `diary-sunrise-sunset', `diary-phases-of-moon',
`diary-parasha', `diary-omer', `diary-rosh-hodesh', and
`diary-sabbath-candles'. See the documentation for the function
`diary-persian-date', `diary-yahrzeit', `diary-sunrise-sunset',
`diary-phases-of-moon', `diary-parasha', `diary-omer', `diary-rosh-hodesh',
and `diary-sabbath-candles'. See the documentation for the function
`list-sexp-diary-entries' for more details.
Diary entries based on the Hebrew and/or the Islamic calendar are also
@ -1393,6 +1394,18 @@ Driven by the variable `calendar-date-display-form'."
"String of Ethiopic date of Gregorian date."
t)
(autoload 'calendar-goto-persian-date "cal-persian"
"Move cursor to Persian date date."
t)
(autoload 'calendar-print-persian-date "cal-persian"
"Show the Persian date equivalents of date."
t)
(autoload 'calendar-persian-date-string "cal-persian"
"String of Persian date of Gregorian date."
t)
(autoload 'show-all-diary-entries "diary-lib"
"Show all of the diary entries in the diary file.
This function gets rid of the selective display of the diary file so that
@ -1708,6 +1721,7 @@ the inserted text. Value is always t."
(define-key calendar-mode-map "gC" 'calendar-goto-chinese-date)
(define-key calendar-mode-map "gk" 'calendar-goto-coptic-date)
(define-key calendar-mode-map "ge" 'calendar-goto-ethiopic-date)
(define-key calendar-mode-map "gp" 'calendar-goto-persian-date)
(define-key calendar-mode-map "gc" 'calendar-goto-iso-date)
(define-key calendar-mode-map "gf" 'calendar-goto-french-date)
(define-key calendar-mode-map "gml" 'calendar-goto-mayan-long-count-date)
@ -1736,6 +1750,7 @@ the inserted text. Value is always t."
(define-key calendar-mode-map "pC" 'calendar-print-chinese-date)
(define-key calendar-mode-map "pk" 'calendar-print-coptic-date)
(define-key calendar-mode-map "pe" 'calendar-print-ethiopic-date)
(define-key calendar-mode-map "pp" 'calendar-print-persian-date)
(define-key calendar-mode-map "pc" 'calendar-print-iso-date)
(define-key calendar-mode-map "pj" 'calendar-print-julian-date)
(define-key calendar-mode-map "pa" 'calendar-print-astro-day-number)