Mercurial > emacs
comparison lisp/calendar/calendar.el @ 93630:8f16c93afd23
(calendar-hebrew-all-holidays-flag):
Rename all-hebrew-calendar-holidays. Update callers, keep old name as alias.
(calendar-christian-all-holidays-flag): Rename
all-christian-calendar-holidays. Update callers, keep old name as alias.
(calendar-islamic-all-holidays-flag): Rename
all-islamic-calendar-holidays. Update callers, keep old name as alias.
(calendar-bahai-all-holidays-flag): Rename all-bahai-calendar-holidays.
Update callers, keep old name as alias.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 04 Apr 2008 04:36:54 +0000 |
parents | 156256220c12 |
children | 447b30ba4c57 |
comparison
equal
deleted
inserted
replaced
93629:a315112c9960 | 93630:8f16c93afd23 |
---|---|
802 :type 'sexp | 802 :type 'sexp |
803 :group 'holidays) | 803 :group 'holidays) |
804 ;;;###autoload | 804 ;;;###autoload |
805 (put 'other-holidays 'risky-local-variable t) | 805 (put 'other-holidays 'risky-local-variable t) |
806 | 806 |
807 (defcustom all-hebrew-calendar-holidays nil | 807 (defcustom calendar-hebrew-all-holidays-flag nil |
808 "If nil, show only major holidays from the Hebrew calendar. | 808 "If nil, show only major holidays from the Hebrew calendar. |
809 This means only those Jewish holidays that appear on secular calendars. | 809 This means only those Jewish holidays that appear on secular calendars. |
810 Otherwise, show all the holidays that would appear in a complete Hebrew | 810 Otherwise, show all the holidays that would appear in a complete Hebrew |
811 calendar." | 811 calendar." |
812 :type 'boolean | 812 :type 'boolean |
813 :group 'holidays) | 813 :group 'holidays) |
814 | 814 |
815 (define-obsolete-variable-alias 'all-hebrew-calendar-holidays | |
816 'calendar-hebrew-all-holidays-flag "23.1") | |
817 | |
815 ;;;###autoload | 818 ;;;###autoload |
816 (defvar hebrew-holidays-1 | 819 (defvar hebrew-holidays-1 |
817 '((holiday-rosh-hashanah-etc) | 820 '((holiday-rosh-hashanah-etc) |
818 (if all-hebrew-calendar-holidays | 821 (if calendar-hebrew-all-holidays-flag |
819 (holiday-julian | 822 (holiday-julian |
820 11 | 823 11 |
821 (let ((m displayed-month) | 824 (let ((m displayed-month) |
822 (y displayed-year) | 825 (y displayed-year) |
823 year) | 826 year) |
834 ;;;###autoload | 837 ;;;###autoload |
835 (make-obsolete-variable 'hebrew-holidays-1 'hebrew-holidays "23.1") | 838 (make-obsolete-variable 'hebrew-holidays-1 'hebrew-holidays "23.1") |
836 | 839 |
837 ;;;###autoload | 840 ;;;###autoload |
838 (defvar hebrew-holidays-2 | 841 (defvar hebrew-holidays-2 |
839 '((holiday-hanukkah) ; respects all-hebrew-calendar-holidays | 842 '((holiday-hanukkah) ; respects calendar-hebrew-all-holidays-flag |
840 (if all-hebrew-calendar-holidays | 843 (if calendar-hebrew-all-holidays-flag |
841 (holiday-hebrew | 844 (holiday-hebrew |
842 10 | 845 10 |
843 (let ((h-year (extract-calendar-year | 846 (let ((h-year (extract-calendar-year |
844 (calendar-hebrew-from-absolute | 847 (calendar-hebrew-from-absolute |
845 (calendar-absolute-from-gregorian | 848 (calendar-absolute-from-gregorian |
846 (list displayed-month 28 displayed-year)))))) | 849 (list displayed-month 28 displayed-year)))))) |
847 (if (= 6 (% (calendar-absolute-from-hebrew (list 10 10 h-year)) | 850 (if (= 6 (% (calendar-absolute-from-hebrew (list 10 10 h-year)) |
848 7)) | 851 7)) |
849 11 10)) | 852 11 10)) |
850 "Tzom Teveth")) | 853 "Tzom Teveth")) |
851 (if all-hebrew-calendar-holidays | 854 (if calendar-hebrew-all-holidays-flag |
852 (holiday-hebrew 11 15 "Tu B'Shevat"))) | 855 (holiday-hebrew 11 15 "Tu B'Shevat"))) |
853 "Component of the default value of `hebrew-holidays'.") | 856 "Component of the default value of `hebrew-holidays'.") |
854 ;;;###autoload | 857 ;;;###autoload |
855 (put 'hebrew-holidays-2 'risky-local-variable t) | 858 (put 'hebrew-holidays-2 'risky-local-variable t) |
856 ;;;###autoload | 859 ;;;###autoload |
857 (make-obsolete-variable 'hebrew-holidays-2 'hebrew-holidays "23.1") | 860 (make-obsolete-variable 'hebrew-holidays-2 'hebrew-holidays "23.1") |
858 | 861 |
859 ;;;###autoload | 862 ;;;###autoload |
860 (defvar hebrew-holidays-3 | 863 (defvar hebrew-holidays-3 |
861 '((if all-hebrew-calendar-holidays | 864 '((if calendar-hebrew-all-holidays-flag |
862 (holiday-hebrew | 865 (holiday-hebrew |
863 11 | 866 11 |
864 (let* ((m displayed-month) | 867 (let* ((m displayed-month) |
865 (y displayed-year) | 868 (y displayed-year) |
866 (h-year (progn | 869 (h-year (progn |
891 (make-obsolete-variable 'hebrew-holidays-3 'hebrew-holidays "23.1") | 894 (make-obsolete-variable 'hebrew-holidays-3 'hebrew-holidays "23.1") |
892 | 895 |
893 ;;;###autoload | 896 ;;;###autoload |
894 (defvar hebrew-holidays-4 | 897 (defvar hebrew-holidays-4 |
895 '((holiday-passover-etc) | 898 '((holiday-passover-etc) |
896 (and all-hebrew-calendar-holidays | 899 (and calendar-hebrew-all-holidays-flag |
897 (let* ((m displayed-month) | 900 (let* ((m displayed-month) |
898 (y displayed-year) | 901 (y displayed-year) |
899 (year (progn | 902 (year (progn |
900 (increment-calendar-month m y -1) | 903 (increment-calendar-month m y -1) |
901 (extract-calendar-year | 904 (extract-calendar-year |
902 (calendar-julian-from-absolute | 905 (calendar-julian-from-absolute |
903 (calendar-absolute-from-gregorian (list m 1 y))))))) | 906 (calendar-absolute-from-gregorian (list m 1 y))))))) |
904 (= 21 (% year 28))) | 907 (= 21 (% year 28))) |
905 (holiday-julian 3 26 "Kiddush HaHamah")) | 908 (holiday-julian 3 26 "Kiddush HaHamah")) |
906 (if all-hebrew-calendar-holidays | 909 (if calendar-hebrew-all-holidays-flag |
907 (holiday-tisha-b-av-etc))) | 910 (holiday-tisha-b-av-etc))) |
908 "Component of the default value of `hebrew-holidays'.") | 911 "Component of the default value of `hebrew-holidays'.") |
909 ;;;###autoload | 912 ;;;###autoload |
910 (put 'hebrew-holidays-4 'risky-local-variable t) | 913 (put 'hebrew-holidays-4 'risky-local-variable t) |
911 ;;;###autoload | 914 ;;;###autoload |
914 ;;;###autoload | 917 ;;;###autoload |
915 (defcustom hebrew-holidays | 918 (defcustom hebrew-holidays |
916 '((holiday-passover-etc) | 919 '((holiday-passover-etc) |
917 (holiday-rosh-hashanah-etc) | 920 (holiday-rosh-hashanah-etc) |
918 (holiday-hanukkah) | 921 (holiday-hanukkah) |
919 (if all-hebrew-calendar-holidays | 922 (if calendar-hebrew-all-holidays-flag |
920 (append | 923 (append |
921 (holiday-tisha-b-av-etc) | 924 (holiday-tisha-b-av-etc) |
922 (holiday-hebrew-misc)))) | 925 (holiday-hebrew-misc)))) |
923 "Jewish holidays. | 926 "Jewish holidays. |
924 See the documentation for `calendar-holidays' for details." | 927 See the documentation for `calendar-holidays' for details." |
926 :version "23.1" ; removed dependency on hebrew-holidays-N | 929 :version "23.1" ; removed dependency on hebrew-holidays-N |
927 :group 'holidays) | 930 :group 'holidays) |
928 ;;;###autoload | 931 ;;;###autoload |
929 (put 'hebrew-holidays 'risky-local-variable t) | 932 (put 'hebrew-holidays 'risky-local-variable t) |
930 | 933 |
931 (defcustom all-christian-calendar-holidays nil | 934 (defcustom calendar-christian-all-holidays-flag nil |
932 "If nil, show only major holidays from the Christian calendar. | 935 "If nil, show only major holidays from the Christian calendar. |
933 This means only those Christian holidays that appear on secular calendars. | 936 This means only those Christian holidays that appear on secular calendars. |
934 Otherwise, show all the holidays that would appear in a complete Christian | 937 Otherwise, show all the holidays that would appear in a complete Christian |
935 calendar." | 938 calendar." |
936 :type 'boolean | 939 :type 'boolean |
937 :group 'holidays) | 940 :group 'holidays) |
938 | 941 |
942 (define-obsolete-variable-alias 'all-christian-calendar-holidays | |
943 'calendar-christian-all-holidays-flag "23.1") | |
944 | |
939 ;;;###autoload | 945 ;;;###autoload |
940 (defcustom christian-holidays | 946 (defcustom christian-holidays |
941 '((holiday-easter-etc) ; respects all-christian-calendar-holidays | 947 '((holiday-easter-etc) ; respects calendar-christian-all-holidays-flag |
942 (holiday-fixed 12 25 "Christmas") | 948 (holiday-fixed 12 25 "Christmas") |
943 (if all-christian-calendar-holidays | 949 (if calendar-christian-all-holidays-flag |
944 (append | 950 (append |
945 (holiday-fixed 1 6 "Epiphany") | 951 (holiday-fixed 1 6 "Epiphany") |
946 (holiday-julian 12 25 "Eastern Orthodox Christmas") | 952 (holiday-julian 12 25 "Eastern Orthodox Christmas") |
947 (holiday-greek-orthodox-easter) | 953 (holiday-greek-orthodox-easter) |
948 (holiday-fixed 8 15 "Assumption") | 954 (holiday-fixed 8 15 "Assumption") |
952 :type 'sexp | 958 :type 'sexp |
953 :group 'holidays) | 959 :group 'holidays) |
954 ;;;###autoload | 960 ;;;###autoload |
955 (put 'christian-holidays 'risky-local-variable t) | 961 (put 'christian-holidays 'risky-local-variable t) |
956 | 962 |
957 (defcustom all-islamic-calendar-holidays nil | 963 (defcustom calendar-islamic-all-holidays-flag nil |
958 "If nil, show only major holidays from the Islamic calendar. | 964 "If nil, show only major holidays from the Islamic calendar. |
959 This means only those Islamic holidays that appear on secular calendars. | 965 This means only those Islamic holidays that appear on secular calendars. |
960 Otherwise, show all the holidays that would appear in a complete Islamic | 966 Otherwise, show all the holidays that would appear in a complete Islamic |
961 calendar." | 967 calendar." |
962 :type 'boolean | 968 :type 'boolean |
963 :group 'holidays) | 969 :group 'holidays) |
964 | 970 |
971 (define-obsolete-variable-alias 'all-islamic-calendar-holidays | |
972 'calendar-islamic-all-holidays-flag "23.1") | |
973 | |
965 ;;;###autoload | 974 ;;;###autoload |
966 (defcustom islamic-holidays | 975 (defcustom islamic-holidays |
967 '((holiday-islamic-new-year) | 976 '((holiday-islamic-new-year) |
968 (holiday-islamic 9 1 "Ramadan Begins") | 977 (holiday-islamic 9 1 "Ramadan Begins") |
969 (if all-islamic-calendar-holidays | 978 (if calendar-islamic-all-holidays-flag |
970 (append | 979 (append |
971 (holiday-islamic 1 10 "Ashura") | 980 (holiday-islamic 1 10 "Ashura") |
972 (holiday-islamic 3 12 "Mulad-al-Nabi") | 981 (holiday-islamic 3 12 "Mulad-al-Nabi") |
973 (holiday-islamic 7 26 "Shab-e-Mi'raj") | 982 (holiday-islamic 7 26 "Shab-e-Mi'raj") |
974 (holiday-islamic 8 15 "Shab-e-Bara't") | 983 (holiday-islamic 8 15 "Shab-e-Bara't") |
980 :type 'sexp | 989 :type 'sexp |
981 :group 'holidays) | 990 :group 'holidays) |
982 ;;;###autoload | 991 ;;;###autoload |
983 (put 'islamic-holidays 'risky-local-variable t) | 992 (put 'islamic-holidays 'risky-local-variable t) |
984 | 993 |
985 (defcustom all-bahai-calendar-holidays nil | 994 (defcustom calendar-bahai-all-holidays-flag nil |
986 "If nil, show only major holidays from the Baha'i calendar. | 995 "If nil, show only major holidays from the Baha'i calendar. |
987 These are the days on which work and school must be suspended. | 996 These are the days on which work and school must be suspended. |
988 Otherwise, show all the holidays that would appear in a complete Baha'i | 997 Otherwise, show all the holidays that would appear in a complete Baha'i |
989 calendar." | 998 calendar." |
990 :type 'boolean | 999 :type 'boolean |
991 :group 'holidays) | 1000 :group 'holidays) |
992 | 1001 |
1002 (define-obsolete-variable-alias 'all-bahai-calendar-holidays | |
1003 'calendar-bahai-all-holidays-flag "23.1") | |
1004 | |
993 ;;;###autoload | 1005 ;;;###autoload |
994 (defcustom bahai-holidays | 1006 (defcustom bahai-holidays |
995 '((holiday-bahai-new-year) | 1007 '((holiday-bahai-new-year) |
996 (holiday-bahai-ridvan) ; respects all-bahai-calendar-holidays | 1008 (holiday-bahai-ridvan) ; respects calendar-bahai-all-holidays-flag |
997 (holiday-fixed 5 23 "Declaration of the Bab") | 1009 (holiday-fixed 5 23 "Declaration of the Bab") |
998 (holiday-fixed 5 29 "Ascension of Baha'u'llah") | 1010 (holiday-fixed 5 29 "Ascension of Baha'u'llah") |
999 (holiday-fixed 7 9 "Martyrdom of the Bab") | 1011 (holiday-fixed 7 9 "Martyrdom of the Bab") |
1000 (holiday-fixed 10 20 "Birth of the Bab") | 1012 (holiday-fixed 10 20 "Birth of the Bab") |
1001 (holiday-fixed 11 12 "Birth of Baha'u'llah") | 1013 (holiday-fixed 11 12 "Birth of Baha'u'llah") |
1002 (if all-bahai-calendar-holidays | 1014 (if calendar-bahai-all-holidays-flag |
1003 (append | 1015 (append |
1004 (holiday-fixed 11 26 "Day of the Covenant") | 1016 (holiday-fixed 11 26 "Day of the Covenant") |
1005 (holiday-fixed 11 28 "Ascension of `Abdu'l-Baha")))) | 1017 (holiday-fixed 11 28 "Ascension of `Abdu'l-Baha")))) |
1006 "Baha'i holidays. | 1018 "Baha'i holidays. |
1007 See the documentation for `calendar-holidays' for details." | 1019 See the documentation for `calendar-holidays' for details." |