comparison lisp/calendar/cal-hebrew.el @ 90182:f042e7c0fe20

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 302-319) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 69) - Update from CVS
author Miles Bader <miles@gnu.org>
date Fri, 20 May 2005 04:22:05 +0000
parents 4da4a09e8b1b a7e02ef1e3d6
children f9a65d7ebd29
comparison
equal deleted inserted replaced
90181:0c828e2b0b6f 90182:f042e7c0fe20
716 (mm-name 716 (mm-name
717 (if m-name-pos 717 (if m-name-pos
718 (buffer-substring 718 (buffer-substring
719 (match-beginning m-name-pos) 719 (match-beginning m-name-pos)
720 (match-end m-name-pos)))) 720 (match-end m-name-pos))))
721 (mm (string-to-int 721 (mm (string-to-number
722 (if m-pos 722 (if m-pos
723 (buffer-substring 723 (buffer-substring
724 (match-beginning m-pos) 724 (match-beginning m-pos)
725 (match-end m-pos)) 725 (match-end m-pos))
726 ""))) 726 "")))
727 (dd (string-to-int 727 (dd (string-to-number
728 (if d-pos 728 (if d-pos
729 (buffer-substring 729 (buffer-substring
730 (match-beginning d-pos) 730 (match-beginning d-pos)
731 (match-end d-pos)) 731 (match-end d-pos))
732 ""))) 732 "")))
741 (let* ((current-y 741 (let* ((current-y
742 (extract-calendar-year 742 (extract-calendar-year
743 (calendar-hebrew-from-absolute 743 (calendar-hebrew-from-absolute
744 (calendar-absolute-from-gregorian 744 (calendar-absolute-from-gregorian
745 (calendar-current-date))))) 745 (calendar-current-date)))))
746 (y (+ (string-to-int y-str) 746 (y (+ (string-to-number y-str)
747 (* 100 (/ current-y 100))))) 747 (* 100 (/ current-y 100)))))
748 (if (> (- y current-y) 50) 748 (if (> (- y current-y) 50)
749 (- y 100) 749 (- y 100)
750 (if (> (- current-y y) 50) 750 (if (> (- current-y y) 50)
751 (+ y 100) 751 (+ y 100)
752 y))) 752 y)))
753 (string-to-int y-str))))) 753 (string-to-number y-str)))))
754 (if dd-name 754 (if dd-name
755 (mark-calendar-days-named 755 (mark-calendar-days-named
756 (cdr (assoc-string dd-name 756 (cdr (assoc-string dd-name
757 (calendar-make-alist 757 (calendar-make-alist
758 calendar-day-name-array 758 calendar-day-name-array