[Emacs-diffs] Changes to emacs/lisp/calendar/cal-islam.el [lexbind]

[Miles Bader]

Index: emacs/lisp/calendar/cal-islam.el
diff -c emacs/lisp/calendar/cal-islam.el:1.10.8.1 
emacs/lisp/calendar/cal-islam.el:1.10.8.2
*** emacs/lisp/calendar/cal-islam.el:1.10.8.1   Fri Apr  4 01:20:15 2003
--- emacs/lisp/calendar/cal-islam.el    Tue Oct 14 19:42:13 2003
***************
*** 1,6 ****
  ;;; cal-islam.el --- calendar functions for the Islamic calendar
  
! ;; Copyright (C) 1995, 1997, 2001 Free Software Foundation, Inc.
  
  ;; Author: Edward M. Reingold <address@hidden>
  ;; Keywords: calendar
--- 1,6 ----
  ;;; cal-islam.el --- calendar functions for the Islamic calendar
  
! ;; Copyright (C) 1995, 1997, 2001, 2003 Free Software Foundation, Inc.
  
  ;; Author: Edward M. Reingold <address@hidden>
  ;; Keywords: calendar
***************
*** 40,50 ****
  
  ;;; Code:
  
  (require 'cal-julian)
  
  (defvar calendar-islamic-month-name-array
    ["Muharram" "Safar" "Rabi I" "Rabi II" "Jumada I" "Jumada II"
!    "Rajab" "Sha'ban" "Ramadan" "Shawwal" "Dhu al-Qada" "Dhu al-Hijjah"])
  
  (defvar calendar-islamic-epoch (calendar-absolute-from-julian '(7 16 622))
    "Absolute date of start of Islamic calendar = August 29, 284 A.D. 
(Julian).")
--- 40,54 ----
  
  ;;; Code:
  
+ (defvar displayed-month)
+ (defvar displayed-year)
+ 
  (require 'cal-julian)
  
  (defvar calendar-islamic-month-name-array
    ["Muharram" "Safar" "Rabi I" "Rabi II" "Jumada I" "Jumada II"
!    "Rajab" "Sha'ban" "Ramadan" "Shawwal" "Dhu al-Qada" "Dhu al-Hijjah"]
! "Array of strings giving the names of the Islamic months.")
  
  (defvar calendar-islamic-epoch (calendar-absolute-from-julian '(7 16 622))
    "Absolute date of start of Islamic calendar = August 29, 284 A.D. 
(Julian).")
***************
*** 221,229 ****
                                   (car d)))
                      (backup (equal (car (car d)) 'backup))
                      (dayname
!                      (concat
!                       (calendar-day-name gdate) "\\|"
!                       (substring (calendar-day-name gdate) 0 3) ".?"))
                      (calendar-month-name-array
                       calendar-islamic-month-name-array)
                      (monthname
--- 225,233 ----
                                   (car d)))
                      (backup (equal (car (car d)) 'backup))
                      (dayname
!                      (format "%s\\|%s\\.?"
!                       (calendar-day-name gdate)
!                       (calendar-day-name gdate 'abbrev)))
                      (calendar-month-name-array
                       calendar-islamic-month-name-array)
                      (monthname
***************
*** 269,275 ****
                          gdate
                          (buffer-substring-no-properties entry-start (point))
                          (buffer-substring-no-properties
!                          (1+ date-start) (1- entry-start)))))))
                 (setq d (cdr d))))
             (setq gdate
                   (calendar-gregorian-from-absolute
--- 273,280 ----
                          gdate
                          (buffer-substring-no-properties entry-start (point))
                          (buffer-substring-no-properties
!                          (1+ date-start) (1- entry-start))
!                         (copy-marker entry-start))))))
                 (setq d (cdr d))))
             (setq gdate
                   (calendar-gregorian-from-absolute
***************
*** 293,303 ****
            ((date-form (if (equal (car (car d)) 'backup)
                            (cdr (car d))
                          (car d)));; ignore 'backup directive
!            (dayname (diary-name-pattern calendar-day-name-array))
             (monthname
!             (concat
!              (diary-name-pattern calendar-islamic-month-name-array t)
!              "\\|\\*"))
             (month "[0-9]+\\|\\*")
             (day "[0-9]+\\|\\*")
             (year "[0-9]+\\|\\*")
--- 298,308 ----
            ((date-form (if (equal (car (car d)) 'backup)
                            (cdr (car d))
                          (car d)));; ignore 'backup directive
!            (dayname (diary-name-pattern calendar-day-name-array
!                                         calendar-day-abbrev-array))
             (monthname
!             (format "%s\\|\\*"
!                     (diary-name-pattern calendar-islamic-month-name-array)))
             (month "[0-9]+\\|\\*")
             (day "[0-9]+\\|\\*")
             (year "[0-9]+\\|\\*")
***************
*** 367,385 ****
                           (string-to-int y-str)))))
              (if dd-name
                  (mark-calendar-days-named
!                  (cdr (assoc-ignore-case (substring dd-name 0 3)
                                           (calendar-make-alist
                                            calendar-day-name-array
!                                           0
!                                           '(lambda (x) (substring x 0 3))))))
                (if mm-name
!                   (if (string-equal mm-name "*")
!                       (setq mm 0)
!                     (setq mm
!                           (cdr (assoc-ignore-case
!                                 mm-name
!                                 (calendar-make-alist
!                                   calendar-islamic-month-name-array))))))
                (mark-islamic-calendar-date-pattern mm dd yy)))))
        (setq d (cdr d)))))
  
--- 372,387 ----
                           (string-to-int y-str)))))
              (if dd-name
                  (mark-calendar-days-named
!                  (cdr (assoc-ignore-case dd-name
                                           (calendar-make-alist
                                            calendar-day-name-array
!                                           0 nil calendar-day-abbrev-array))))
                (if mm-name
!                   (setq mm (if (string-equal mm-name "*") 0
!                              (cdr (assoc-ignore-case
!                                    mm-name
!                                    (calendar-make-alist
!                                     calendar-islamic-month-name-array))))))
                (mark-islamic-calendar-date-pattern mm dd yy)))))
        (setq d (cdr d)))))
  
***************
*** 495,498 ****
--- 497,501 ----
  
  (provide 'cal-islam)
  
+ ;;; arch-tag: a951b6c1-6f47-48d5-bac3-1b505cd719f7
  ;;; cal-islam.el ends here