[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-islam.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-islam.el,v |
Date: |
Mon, 07 Apr 2008 01:59:40 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/04/07 01:59:37
Index: cal-islam.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-islam.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- cal-islam.el 6 Apr 2008 20:53:57 -0000 1.47
+++ cal-islam.el 7 Apr 2008 01:59:36 -0000 1.48
@@ -59,18 +59,18 @@
(defun calendar-islamic-day-number (date)
"Return the day number within the year of the Islamic date DATE."
- (let ((month (extract-calendar-month date)))
+ (let ((month (calendar-extract-month date)))
(+ (* 30 (/ month 2))
(* 29 (/ (1- month) 2))
- (extract-calendar-day date))))
+ (calendar-extract-day date))))
(defun calendar-islamic-to-absolute (date)
"Absolute date of Islamic DATE.
The absolute date is the number of days elapsed since the (imaginary)
Gregorian date Sunday, December 31, 1 BC."
- (let* ((month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date))
+ (let* ((month (calendar-extract-month date))
+ (day (calendar-extract-day date))
+ (year (calendar-extract-year date))
(y (% year 30))
(leap-years-in-cycle (cond ((< y 3) 0)
((< y 6) 1)
@@ -130,7 +130,7 @@
(islamic-date (calendar-islamic-from-absolute
(calendar-absolute-from-gregorian
(or date (calendar-current-date))))))
- (if (< (extract-calendar-year islamic-date) 1)
+ (if (< (calendar-extract-year islamic-date) 1)
""
(calendar-date-string islamic-date nil t))))
@@ -154,7 +154,7 @@
"Islamic calendar year (>0): "
(lambda (x) (> x 0))
(int-to-string
- (extract-calendar-year
+ (calendar-extract-year
(calendar-islamic-from-absolute
(calendar-absolute-from-gregorian today))))))
(month-array calendar-islamic-month-name-array)
@@ -182,7 +182,7 @@
(define-obsolete-function-alias 'calendar-goto-islamic-date
'calendar-islamic-goto-date "23.1")
-(defvar displayed-month) ; from generate-calendar
+(defvar displayed-month) ; from calendar-generate
(defvar displayed-year)
;;;###holiday-autoload
@@ -199,8 +199,8 @@
(let* ((islamic-date (calendar-islamic-from-absolute
(calendar-absolute-from-gregorian
(list displayed-month 15 displayed-year))))
- (m (extract-calendar-month islamic-date))
- (y (extract-calendar-year islamic-date))
+ (m (calendar-extract-month islamic-date))
+ (y (calendar-extract-year islamic-date))
date)
(unless (< m 1) ; Islamic calendar doesn't apply
;; Since converting to absolute dates can be a complex
@@ -220,7 +220,7 @@
;; Hence to test if any given month might be visible, we can
;; shift things and ask about October.
;; At the same time, we work out the appropriate year y to use.
- (increment-calendar-month m y (- 10 month))
+ (calendar-increment-month m y (- 10 month))
(and (> m 7) ; Islamic date might be visible
(calendar-date-is-visible-p
(setq date (calendar-gregorian-from-absolute
@@ -237,8 +237,8 @@
(list (list date
(format "Islamic New Year %d"
(progn
- (increment-calendar-month m y 1)
- (extract-calendar-year
+ (calendar-increment-month m y 1)
+ (calendar-extract-year
(calendar-islamic-from-absolute
(calendar-absolute-from-gregorian
(list m (calendar-last-day-of-month m y) y)
@@ -271,7 +271,7 @@
(defun calendar-islamic-mark-date-pattern (month day year &optional color)
"Mark dates in calendar window that conform to Islamic date MONTH/DAY/YEAR.
A value of 0 in any position is a wildcard. Optional argument COLOR is
-passed to `mark-visible-calendar-date' as MARK."
+passed to `calendar-mark-visible-date' as MARK."
(calendar-mark-1 month day year 'calendar-islamic-from-absolute
'calendar-islamic-to-absolute color))
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-islam.el,v, Glenn Morris, 2008/04/03
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-islam.el,v, Glenn Morris, 2008/04/04
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-islam.el,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-islam.el,v, Glenn Morris, 2008/04/06
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-islam.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-islam.el,v, Glenn Morris, 2008/04/08
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-islam.el,v, Glenn Morris, 2008/04/22