Mercurial > hg > xemacs-beta
comparison lisp/calendar/calendar.el @ 74:54cc21c15cbb r20-0b32
Import from CVS: tag r20-0b32
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:04:33 +0200 |
parents | 131b0175ea99 |
children | 34a5b81f86ba |
comparison
equal
deleted
inserted
replaced
73:e2d7a37b7c8d | 74:54cc21c15cbb |
---|---|
624 somewhat; setting it to nil makes the diary display faster.") | 624 somewhat; setting it to nil makes the diary display faster.") |
625 | 625 |
626 (defvar calendar-mark-ring nil) | 626 (defvar calendar-mark-ring nil) |
627 | 627 |
628 ;;;###autoload | 628 ;;;###autoload |
629 (put 'general-holidays 'risky-local-variable t) | |
630 ;;;###autoload | |
631 (defvar general-holidays | 629 (defvar general-holidays |
632 '((holiday-fixed 1 1 "New Year's Day") | 630 '((holiday-fixed 1 1 "New Year's Day") |
633 (holiday-float 1 1 3 "Martin Luther King Day") | 631 (holiday-float 1 1 3 "Martin Luther King Day") |
634 (holiday-fixed 2 2 "Ground Hog Day") | 632 (holiday-fixed 2 2 "Ground Hog Day") |
635 (holiday-fixed 2 14 "Valentine's Day") | 633 (holiday-fixed 2 14 "Valentine's Day") |
648 (holiday-float 11 4 4 "Thanksgiving")) | 646 (holiday-float 11 4 4 "Thanksgiving")) |
649 "*General holidays. Default value is for the United States. | 647 "*General holidays. Default value is for the United States. |
650 See the documentation for `calendar-holidays' for details.") | 648 See the documentation for `calendar-holidays' for details.") |
651 | 649 |
652 ;;;###autoload | 650 ;;;###autoload |
653 (put 'local-holidays 'risky-local-variable t) | 651 (put 'general-holidays 'risky-local-variable t) |
652 | |
654 ;;;###autoload | 653 ;;;###autoload |
655 (defvar local-holidays nil | 654 (defvar local-holidays nil |
656 "*Local holidays. | 655 "*Local holidays. |
657 See the documentation for `calendar-holidays' for details.") | 656 See the documentation for `calendar-holidays' for details.") |
658 | 657 |
659 ;;;###autoload | 658 ;;;###autoload |
660 (put 'other-holidays 'risky-local-variable t) | 659 (put 'local-holidays 'risky-local-variable t) |
661 ;;;###autoload | 660 ;;;###autoload |
662 (defvar other-holidays nil | 661 (defvar other-holidays nil |
663 "*User defined holidays. | 662 "*User defined holidays. |
664 See the documentation for `calendar-holidays' for details.") | 663 See the documentation for `calendar-holidays' for details.") |
665 | 664 |
666 ;;;###autoload | 665 ;;;###autoload |
667 (put 'hebrew-holidays-1 'risky-local-variable t) | 666 (put 'other-holidays 'risky-local-variable t) |
667 | |
668 ;;;###autoload | 668 ;;;###autoload |
669 (defvar hebrew-holidays-1 | 669 (defvar hebrew-holidays-1 |
670 '((holiday-rosh-hashanah-etc) | 670 '((holiday-rosh-hashanah-etc) |
671 (if all-hebrew-calendar-holidays | 671 (if all-hebrew-calendar-holidays |
672 (holiday-julian | 672 (holiday-julian |
682 (if (zerop (% (1+ year) 4)) | 682 (if (zerop (% (1+ year) 4)) |
683 22 | 683 22 |
684 21))) "\"Tal Umatar\" (evening)")))) | 684 21))) "\"Tal Umatar\" (evening)")))) |
685 | 685 |
686 ;;;###autoload | 686 ;;;###autoload |
687 (put 'hebrew-holidays-2 'risky-local-variable t) | 687 (put 'hebrew-holidays-1 'risky-local-variable t) |
688 | |
688 ;;;###autoload | 689 ;;;###autoload |
689 (defvar hebrew-holidays-2 | 690 (defvar hebrew-holidays-2 |
690 '((if all-hebrew-calendar-holidays | 691 '((if all-hebrew-calendar-holidays |
691 (holiday-hanukkah) | 692 (holiday-hanukkah) |
692 (holiday-hebrew 9 25 "Hanukkah")) | 693 (holiday-hebrew 9 25 "Hanukkah")) |
704 "Tzom Teveth")) | 705 "Tzom Teveth")) |
705 (if all-hebrew-calendar-holidays | 706 (if all-hebrew-calendar-holidays |
706 (holiday-hebrew 11 15 "Tu B'Shevat")))) | 707 (holiday-hebrew 11 15 "Tu B'Shevat")))) |
707 | 708 |
708 ;;;###autoload | 709 ;;;###autoload |
709 (put 'hebrew-holidays-3 'risky-local-variable t) | 710 (put 'hebrew-holidays-2 'risky-local-variable t) |
711 | |
710 ;;;###autoload | 712 ;;;###autoload |
711 (defvar hebrew-holidays-3 | 713 (defvar hebrew-holidays-3 |
712 '((if all-hebrew-calendar-holidays | 714 '((if all-hebrew-calendar-holidays |
713 (holiday-hebrew | 715 (holiday-hebrew |
714 11 | 716 11 |
735 6 (calendar-absolute-from-hebrew | 737 6 (calendar-absolute-from-hebrew |
736 (list 11 16 h-year)))))) | 738 (list 11 16 h-year)))))) |
737 (day (extract-calendar-day s-s))) | 739 (day (extract-calendar-day s-s))) |
738 day)) | 740 day)) |
739 "Shabbat Shirah")))) | 741 "Shabbat Shirah")))) |
740 | 742 ;;;###autoload |
741 ;;;###autoload | 743 (put 'hebrew-holidays-3 'risky-local-variable t) |
742 (put 'hebrew-holidays-4 'risky-local-variable t) | 744 |
743 ;;;###autoload | 745 ;;;###autoload |
744 (defvar hebrew-holidays-4 | 746 (defvar hebrew-holidays-4 |
745 '((holiday-passover-etc) | 747 '((holiday-passover-etc) |
746 (if (and all-hebrew-calendar-holidays | 748 (if (and all-hebrew-calendar-holidays |
747 (let* ((m displayed-month) | 749 (let* ((m displayed-month) |
754 (list m 1 y)))))) | 756 (list m 1 y)))))) |
755 (= 21 (% year 28))))) | 757 (= 21 (% year 28))))) |
756 (holiday-julian 3 26 "Kiddush HaHamah")) | 758 (holiday-julian 3 26 "Kiddush HaHamah")) |
757 (if all-hebrew-calendar-holidays | 759 (if all-hebrew-calendar-holidays |
758 (holiday-tisha-b-av-etc)))) | 760 (holiday-tisha-b-av-etc)))) |
759 | 761 ;;;###autoload |
760 ;;;###autoload | 762 (put 'hebrew-holidays-4 'risky-local-variable t) |
761 (put 'hebrew-holidays 'risky-local-variable t) | 763 |
762 ;;;###autoload | 764 ;;;###autoload |
763 (defvar hebrew-holidays (append hebrew-holidays-1 hebrew-holidays-2 | 765 (defvar hebrew-holidays (append hebrew-holidays-1 hebrew-holidays-2 |
764 hebrew-holidays-3 hebrew-holidays-4) | 766 hebrew-holidays-3 hebrew-holidays-4) |
765 "*Jewish holidays. | 767 "*Jewish holidays. |
766 See the documentation for `calendar-holidays' for details.") | 768 See the documentation for `calendar-holidays' for details.") |
767 | 769 |
768 ;;;###autoload | 770 ;;;###autoload |
769 (put 'christian-holidays 'risky-local-variable t) | 771 (put 'hebrew-holidays 'risky-local-variable t) |
772 | |
770 ;;;###autoload | 773 ;;;###autoload |
771 (defvar christian-holidays | 774 (defvar christian-holidays |
772 '((if all-christian-calendar-holidays | 775 '((if all-christian-calendar-holidays |
773 (holiday-fixed 1 6 "Epiphany")) | 776 (holiday-fixed 1 6 "Epiphany")) |
774 (holiday-easter-etc) | 777 (holiday-easter-etc) |
783 (holiday-julian 12 25 "Eastern Orthodox Christmas"))) | 786 (holiday-julian 12 25 "Eastern Orthodox Christmas"))) |
784 "*Christian holidays. | 787 "*Christian holidays. |
785 See the documentation for `calendar-holidays' for details.") | 788 See the documentation for `calendar-holidays' for details.") |
786 | 789 |
787 ;;;###autoload | 790 ;;;###autoload |
788 (put 'islamic-holidays 'risky-local-variable t) | 791 (put 'christian-holidays 'risky-local-variable t) |
792 | |
789 ;;;###autoload | 793 ;;;###autoload |
790 (defvar islamic-holidays | 794 (defvar islamic-holidays |
791 '((holiday-islamic | 795 '((holiday-islamic |
792 1 1 | 796 1 1 |
793 (format "Islamic New Year %d" | 797 (format "Islamic New Year %d" |
816 (holiday-islamic 12 10 "Id-al-Adha"))) | 820 (holiday-islamic 12 10 "Id-al-Adha"))) |
817 "*Islamic holidays. | 821 "*Islamic holidays. |
818 See the documentation for `calendar-holidays' for details.") | 822 See the documentation for `calendar-holidays' for details.") |
819 | 823 |
820 ;;;###autoload | 824 ;;;###autoload |
821 (put 'solar-holidays 'risky-local-variable t) | 825 (put 'islamic-holidays 'risky-local-variable t) |
826 | |
822 ;;;###autoload | 827 ;;;###autoload |
823 (defvar solar-holidays | 828 (defvar solar-holidays |
824 '((if (fboundp 'atan) | 829 '((if (fboundp 'atan) |
825 (solar-equinoxes-solstices)) | 830 (solar-equinoxes-solstices)) |
826 (if (progn | 831 (if (progn |
846 "")))) | 851 "")))) |
847 "*Sun-related holidays. | 852 "*Sun-related holidays. |
848 See the documentation for `calendar-holidays' for details.") | 853 See the documentation for `calendar-holidays' for details.") |
849 | 854 |
850 ;;;###autoload | 855 ;;;###autoload |
851 (put 'calendar-holidays 'risky-local-variable t) | 856 (put 'solar-holidays 'risky-local-variable t) |
857 | |
858 ;;;###autoload | |
852 (defvar calendar-holidays | 859 (defvar calendar-holidays |
853 (append general-holidays local-holidays other-holidays | 860 (append general-holidays local-holidays other-holidays |
854 christian-holidays hebrew-holidays islamic-holidays | 861 christian-holidays hebrew-holidays islamic-holidays |
855 solar-holidays) | 862 solar-holidays) |
856 "*List of notable days for the command M-x holidays. | 863 "*List of notable days for the command M-x holidays. |
937 to the holiday list, where `lunar-phases' is an Emacs-Lisp function that | 944 to the holiday list, where `lunar-phases' is an Emacs-Lisp function that |
938 you've written to return a (possibly empty) list of the relevant VISIBLE dates | 945 you've written to return a (possibly empty) list of the relevant VISIBLE dates |
939 with descriptive strings such as | 946 with descriptive strings such as |
940 | 947 |
941 (((2 6 1989) \"New Moon\") ((2 12 1989) \"First Quarter Moon\") ... ).") | 948 (((2 6 1989) \"New Moon\") ((2 12 1989) \"First Quarter Moon\") ... ).") |
949 | |
950 ;;;###autoload | |
951 (put 'calendar-holidays 'risky-local-variable t) | |
942 | 952 |
943 (defconst calendar-buffer "*Calendar*" | 953 (defconst calendar-buffer "*Calendar*" |
944 "Name of the buffer used for the calendar.") | 954 "Name of the buffer used for the calendar.") |
945 | 955 |
946 (defconst holiday-buffer "*Holidays*" | 956 (defconst holiday-buffer "*Holidays*" |