[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-persia.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-persia.el,v |
Date: |
Sat, 08 Mar 2008 04:18:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/03/08 04:18:57
Index: cal-persia.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-persia.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- cal-persia.el 8 Mar 2008 03:45:43 -0000 1.18
+++ cal-persia.el 8 Mar 2008 04:18:57 -0000 1.19
@@ -1,7 +1,7 @@
;;; cal-persia.el --- calendar functions for the Persian calendar
-;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008 Free Software Foundation, Inc.
;; Author: Edward M. Reingold <address@hidden>
;; Maintainer: Glenn Morris <address@hidden>
@@ -32,22 +32,19 @@
;;; Code:
-(defvar date)
-
(require 'cal-julian)
-(defvar persian-calendar-month-name-array
+(defconst persian-calendar-month-name-array
["Farvardin" "Ordibehest" "Xordad" "Tir" "Mordad" "Sahrivar" "Mehr" "Aban"
"Azar" "Dey" "Bahman" "Esfand"])
-(defvar persian-calendar-epoch (calendar-absolute-from-julian '(3 19 622))
+(defconst persian-calendar-epoch (calendar-absolute-from-julian '(3 19 622))
"Absolute date of start of Persian calendar = March 19, 622 A.D. (Julian).")
(defun persian-calendar-leap-year-p (year)
"True if YEAR is a leap year on the Persian calendar."
(< (mod (* (mod (mod (if (<= 0 year)
- ; No year zero
- (+ year 2346)
+ (+ year 2346) ; no year zero
(+ year 2347))
2820)
768)
@@ -177,7 +174,7 @@
(let* ((today (calendar-current-date))
(year (calendar-read
"Persian calendar year (not 0): "
- (lambda (x) (/= x 0))
+ (lambda (x) (not (zerop x)))
(int-to-string
(extract-calendar-year
(calendar-persian-from-absolute
@@ -197,6 +194,9 @@
(lambda (x) (and (< 0 x) (<= x last))))))
(list (list month day year))))
+(defvar date)
+
+;; To be called from list-sexp-diary-entries, where DATE is bound.
(defun diary-persian-date ()
"Persian calendar equivalent of date diary entry."
(format "Persian date: %s" (calendar-persian-date-string date)))
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-persia.el,v, Glenn Morris, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-persia.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-persia.el,v, Glenn Morris, 2008/03/12
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-persia.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-persia.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-persia.el,v, Glenn Morris, 2008/03/24
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-persia.el,v, Glenn Morris, 2008/03/25
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-persia.el,v, Glenn Morris, 2008/03/31