Mercurial > emacs

comparison lisp/calendar/calendar.el @ 92681:28746000b6be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(general-holidays, oriental-holidays) (local-holidays, other-holidays, hebrew-holidays-1, hebrew-holidays-2) (hebrew-holidays-3, hebrew-holidays-4, hebrew-holidays) (christian-holidays, islamic-holidays, bahai-holidays, solar-holidays) (calendar-holidays): Restore autoload cookies, because people are used to using these variables without loading calendar.el.
author Glenn Morris <rgm@gnu.org>
date Sun, 09 Mar 2008 19:20:52 +0000
parents 020d7b75c13a
children 001682fd0516
comparison
equal deleted inserted replaced
92680:db9c8b3e166f 92681:28746000b6be
678 (defcustom calendar-debug-sexp nil 678 (defcustom calendar-debug-sexp nil
679 "Turn debugging on when evaluating a sexp in the diary or holiday list." 679 "Turn debugging on when evaluating a sexp in the diary or holiday list."
680 :type 'boolean 680 :type 'boolean
681 :group 'calendar) 681 :group 'calendar)
682 682
683 ;;;###autoload
683 (defcustom general-holidays 684 (defcustom general-holidays
684 '((holiday-fixed 1 1 "New Year's Day") 685 '((holiday-fixed 1 1 "New Year's Day")
685 (holiday-float 1 1 3 "Martin Luther King Day") 686 (holiday-float 1 1 3 "Martin Luther King Day")
686 (holiday-fixed 2 2 "Groundhog Day") 687 (holiday-fixed 2 2 "Groundhog Day")
687 (holiday-fixed 2 14 "Valentine's Day") 688 (holiday-fixed 2 14 "Valentine's Day")
703 :type 'sexp 704 :type 'sexp
704 :group 'holidays) 705 :group 'holidays)
705 ;;;###autoload 706 ;;;###autoload
706 (put 'general-holidays 'risky-local-variable t) 707 (put 'general-holidays 'risky-local-variable t)
707 708
709 ;;;###autoload
708 (defcustom oriental-holidays 710 (defcustom oriental-holidays
709 '((if (fboundp 'atan) 711 '((if (fboundp 'atan)
710 (holiday-chinese-new-year))) 712 (holiday-chinese-new-year)))
711 "Oriental holidays. 713 "Oriental holidays.
712 See the documentation for `calendar-holidays' for details." 714 See the documentation for `calendar-holidays' for details."
713 :type 'sexp 715 :type 'sexp
714 :group 'holidays) 716 :group 'holidays)
715 ;;;###autoload 717 ;;;###autoload
716 (put 'oriental-holidays 'risky-local-variable t) 718 (put 'oriental-holidays 'risky-local-variable t)
717 719
720 ;;;###autoload
718 (defcustom local-holidays nil 721 (defcustom local-holidays nil
719 "Local holidays. 722 "Local holidays.
720 See the documentation for `calendar-holidays' for details." 723 See the documentation for `calendar-holidays' for details."
721 :type 'sexp 724 :type 'sexp
722 :group 'holidays) 725 :group 'holidays)
723 ;;;###autoload 726 ;;;###autoload
724 (put 'local-holidays 'risky-local-variable t) 727 (put 'local-holidays 'risky-local-variable t)
725 728
729 ;;;###autoload
726 (defcustom other-holidays nil 730 (defcustom other-holidays nil
727 "User defined holidays. 731 "User defined holidays.
728 See the documentation for `calendar-holidays' for details." 732 See the documentation for `calendar-holidays' for details."
729 :type 'sexp 733 :type 'sexp
730 :group 'holidays) 734 :group 'holidays)
737 Otherwise, show all the holidays that would appear in a complete Hebrew 741 Otherwise, show all the holidays that would appear in a complete Hebrew
738 calendar." 742 calendar."
739 :type 'boolean 743 :type 'boolean
740 :group 'holidays) 744 :group 'holidays)
741 745
746 ;;;###autoload
742 (defvar hebrew-holidays-1 747 (defvar hebrew-holidays-1
743 '((holiday-rosh-hashanah-etc) 748 '((holiday-rosh-hashanah-etc)
744 (if all-hebrew-calendar-holidays 749 (if all-hebrew-calendar-holidays
745 (holiday-julian 750 (holiday-julian
746 11 751 11
756 22 761 22
757 21))) "\"Tal Umatar\" (evening)")))) 762 21))) "\"Tal Umatar\" (evening)"))))
758 ;;;###autoload 763 ;;;###autoload
759 (put 'hebrew-holidays-1 'risky-local-variable t) 764 (put 'hebrew-holidays-1 'risky-local-variable t)
760 765
766 ;;;###autoload
761 (defvar hebrew-holidays-2 767 (defvar hebrew-holidays-2
762 '((if all-hebrew-calendar-holidays 768 '((if all-hebrew-calendar-holidays
763 (holiday-hanukkah) 769 (holiday-hanukkah)
764 (holiday-hebrew 9 25 "Hanukkah")) 770 (holiday-hebrew 9 25 "Hanukkah"))
765 (if all-hebrew-calendar-holidays 771 (if all-hebrew-calendar-holidays
777 (if all-hebrew-calendar-holidays 783 (if all-hebrew-calendar-holidays
778 (holiday-hebrew 11 15 "Tu B'Shevat")))) 784 (holiday-hebrew 11 15 "Tu B'Shevat"))))
779 ;;;###autoload 785 ;;;###autoload
780 (put 'hebrew-holidays-2 'risky-local-variable t) 786 (put 'hebrew-holidays-2 'risky-local-variable t)
781 787
788 ;;;###autoload
782 (defvar hebrew-holidays-3 789 (defvar hebrew-holidays-3
783 '((if all-hebrew-calendar-holidays 790 '((if all-hebrew-calendar-holidays
784 (holiday-hebrew 791 (holiday-hebrew
785 11 792 11
786 (let ((m displayed-month) 793 (let ((m displayed-month)
809 day)) 816 day))
810 "Shabbat Shirah")))) 817 "Shabbat Shirah"))))
811 ;;;###autoload 818 ;;;###autoload
812 (put 'hebrew-holidays-3 'risky-local-variable t) 819 (put 'hebrew-holidays-3 'risky-local-variable t)
813 820
821 ;;;###autoload
814 (defvar hebrew-holidays-4 822 (defvar hebrew-holidays-4
815 '((holiday-passover-etc) 823 '((holiday-passover-etc)
816 (if (and all-hebrew-calendar-holidays 824 (if (and all-hebrew-calendar-holidays
817 (let* ((m displayed-month) 825 (let* ((m displayed-month)
818 (y displayed-year) 826 (y displayed-year)
827 (if all-hebrew-calendar-holidays 835 (if all-hebrew-calendar-holidays
828 (holiday-tisha-b-av-etc)))) 836 (holiday-tisha-b-av-etc))))
829 ;;;###autoload 837 ;;;###autoload
830 (put 'hebrew-holidays-4 'risky-local-variable t) 838 (put 'hebrew-holidays-4 'risky-local-variable t)
831 839
840 ;;;###autoload
832 (defcustom hebrew-holidays (append hebrew-holidays-1 hebrew-holidays-2 841 (defcustom hebrew-holidays (append hebrew-holidays-1 hebrew-holidays-2
833 hebrew-holidays-3 hebrew-holidays-4) 842 hebrew-holidays-3 hebrew-holidays-4)
834 "Jewish holidays. 843 "Jewish holidays.
835 See the documentation for `calendar-holidays' for details." 844 See the documentation for `calendar-holidays' for details."
836 :type 'sexp 845 :type 'sexp
844 Otherwise, show all the holidays that would appear in a complete Christian 853 Otherwise, show all the holidays that would appear in a complete Christian
845 calendar." 854 calendar."
846 :type 'boolean 855 :type 'boolean
847 :group 'holidays) 856 :group 'holidays)
848 857
858 ;;;###autoload
849 (defcustom christian-holidays 859 (defcustom christian-holidays
850 '((if all-christian-calendar-holidays 860 '((if all-christian-calendar-holidays
851 (holiday-fixed 1 6 "Epiphany")) 861 (holiday-fixed 1 6 "Epiphany"))
852 (holiday-easter-etc 0 "Easter Sunday") 862 (holiday-easter-etc 0 "Easter Sunday")
853 (holiday-easter-etc -2 "Good Friday") 863 (holiday-easter-etc -2 "Good Friday")
902 Otherwise, show all the holidays that would appear in a complete Islamic 912 Otherwise, show all the holidays that would appear in a complete Islamic
903 calendar." 913 calendar."
904 :type 'boolean 914 :type 'boolean
905 :group 'holidays) 915 :group 'holidays)
906 916
917 ;;;###autoload
907 (defcustom islamic-holidays 918 (defcustom islamic-holidays
908 '((holiday-islamic 919 '((holiday-islamic
909 1 1 920 1 1
910 (format "Islamic New Year %d" 921 (format "Islamic New Year %d"
911 (let ((m displayed-month) 922 (let ((m displayed-month)
944 Otherwise, show all the holidays that would appear in a complete Baha'i 955 Otherwise, show all the holidays that would appear in a complete Baha'i
945 calendar." 956 calendar."
946 :type 'boolean 957 :type 'boolean
947 :group 'holidays) 958 :group 'holidays)
948 959
960 ;;;###autoload
949 (defcustom bahai-holidays 961 (defcustom bahai-holidays
950 '((holiday-fixed 962 '((holiday-fixed
951 3 21 963 3 21
952 (format "Baha'i New Year (Naw-Ruz) %d" (- displayed-year (1- 1844)))) 964 (format "Baha'i New Year (Naw-Ruz) %d" (- displayed-year (1- 1844))))
953 (holiday-fixed 4 21 "First Day of Ridvan") 965 (holiday-fixed 4 21 "First Day of Ridvan")
985 :type 'sexp 997 :type 'sexp
986 :group 'holidays) 998 :group 'holidays)
987 ;;;###autoload 999 ;;;###autoload
988 (put 'bahai-holidays 'risky-local-variable t) 1000 (put 'bahai-holidays 'risky-local-variable t)
989 1001
1002 ;;;###autoload
990 (defcustom solar-holidays 1003 (defcustom solar-holidays
991 '((if (fboundp 'atan) 1004 '((if (fboundp 'atan)
992 (solar-equinoxes-solstices)) 1005 (solar-equinoxes-solstices))
993 (if (require 'cal-dst) 1006 (if (require 'cal-dst)
994 (funcall 1007 (funcall
1014 :type 'sexp 1027 :type 'sexp
1015 :group 'holidays) 1028 :group 'holidays)
1016 ;;;###autoload 1029 ;;;###autoload
1017 (put 'solar-holidays 'risky-local-variable t) 1030 (put 'solar-holidays 'risky-local-variable t)
1018 1031
1032 ;;;###autoload
1019 (defcustom calendar-holidays 1033 (defcustom calendar-holidays
1020 (append general-holidays local-holidays other-holidays 1034 (append general-holidays local-holidays other-holidays
1021 christian-holidays hebrew-holidays islamic-holidays 1035 christian-holidays hebrew-holidays islamic-holidays
1022 bahai-holidays oriental-holidays solar-holidays) 1036 bahai-holidays oriental-holidays solar-holidays)
1023 "List of notable days for the command \\[holidays]. 1037 "List of notable days for the command \\[holidays].