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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/08 20:50:24

Index: cal-islam.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-islam.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- cal-islam.el        8 Mar 2008 04:23:19 -0000       1.30
+++ cal-islam.el        8 Mar 2008 20:50:24 -0000       1.31
@@ -85,27 +85,27 @@
            ((< y 3) 0)  ((< y 6) 1)  ((< y 8) 2)  ((< y 11) 3) ((< y 14) 4)
            ((< y 17) 5) ((< y 19) 6) ((< y 22) 7) ((< y 25) 8) ((< y 27) 9)
            (t 10))))
-    (+ (islamic-calendar-day-number date);; days so far this year
-       (* (1- year) 354)                 ;; days in all non-leap years
-       (* 11 (/ year 30))                ;; leap days in complete cycles
-       leap-years-in-cycle               ;; leap days this cycle
-       (1- calendar-islamic-epoch))))    ;; days before start of calendar
+    (+ (islamic-calendar-day-number date) ; days so far this year
+       (* (1- year) 354)                  ; days in all non-leap years
+       (* 11 (/ year 30))             ; leap days in complete cycles
+       leap-years-in-cycle            ; leap days this cycle
+       (1- calendar-islamic-epoch)))) ; days before start of calendar
 
 (defun calendar-islamic-from-absolute (date)
   "Compute the Islamic date (month day year) corresponding to absolute DATE.
 The absolute date is the number of days elapsed since the (imaginary)
 Gregorian date Sunday, December 31, 1 BC."
   (if (< date calendar-islamic-epoch)
-      (list 0 0 0);; pre-Islamic date
+      (list 0 0 0)                      ; pre-Islamic date
     (let* ((approx (/ (- date calendar-islamic-epoch)
-                      355));; Approximation from below.
-           (year           ;; Search forward from the approximation.
+                      355))  ; approximation from below
+           (year             ; search forward from the approximation
             (+ approx
                (calendar-sum y approx
                              (>= date (calendar-absolute-from-islamic
                                        (list 1 1 (1+ y))))
                              1)))
-           (month          ;; Search forward from Muharram.
+           (month                       ; search forward from Muharram
             (1+ (calendar-sum m 1
                               (> date
                                  (calendar-absolute-from-islamic
@@ -114,7 +114,7 @@
                                          m year)
                                         year)))
                               1)))
-           (day            ;; Calculate the day by subtraction.
+           (day                    ; calculate the day by subtraction
             (- date
                (1- (calendar-absolute-from-islamic (list month 1 year))))))
       (list month day year))))
@@ -190,9 +190,9 @@
          (y (extract-calendar-year islamic-date))
         (date))
     (if (< m 1)
-        nil;;   Islamic calendar doesn't apply.
+        nil                        ;   Islamic calendar doesn't apply
       (increment-calendar-month m y (- 10 month))
-      (if (> m 7);;  Islamic date might be visible
+      (if (> m 7)                     ;  Islamic date might be visible
           (let ((date (calendar-gregorian-from-absolute
                        (calendar-absolute-from-islamic (list month day y)))))
             (if (calendar-date-is-visible-p date)
@@ -309,7 +309,7 @@
       (let*
           ((date-form (if (equal (car (car d)) 'backup)
                           (cdr (car d))
-                        (car d)));; ignore 'backup directive
+                        (car d)))       ; ignore 'backup directive
            (dayname (diary-name-pattern calendar-day-name-array
                                         calendar-day-abbrev-array))
            (monthname
@@ -418,9 +418,9 @@
                  (y (extract-calendar-year islamic-date))
                  (date))
             (if (< m 1)
-                nil;;   Islamic calendar doesn't apply.
+                nil                ;   Islamic calendar doesn't apply
               (increment-calendar-month m y (- 10 month))
-              (if (> m 7);;  Islamic date might be visible
+              (if (> m 7)             ;  Islamic date might be visible
                   (let ((date (calendar-gregorian-from-absolute
                                (calendar-absolute-from-islamic
                                 (list month day y)))))