Changeset 4079 for trunk/lisp/calendar/calendar.el
- Timestamp:
- 2006年05月13日 11時31分18秒 (3 years ago)
- Files:
-
- trunk/lisp/calendar/calendar.el (modified) (22 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lisp/calendar/calendar.el
r4058 r4079 1375 1375 (car date)) 1376 1376 1377 ;; Note gives wrong answer for result of (calendar-read-date 'noday). 1377 1378 (defsubst extract-calendar-day (date) 1378 1379 "Extract the day part of DATE which has the form (month day year)." … … 1640 1641 (month (extract-calendar-month date)) 1641 1642 (year (extract-calendar-year date))) 1643 ;; (calendar-read-date t) returns a date with day = nil, which is 1644 ;; not a legal date for the visible test in the diary section. 1645 (if arg (setcar (cdr date) 1)) 1642 1646 (pop-to-buffer calendar-buffer) 1643 1647 (increment-calendar-month month year (- calendar-offset)) … … 1683 1687 1684 1688 (autoload 'calendar-french-date-string "cal-french" 1685 "String of French Revolutionary date of Gregorian date." 1686 t) 1689 "String of French Revolutionary date of Gregorian date.") 1687 1690 1688 1691 (autoload 'calendar-mayan-date-string "cal-mayan" 1689 "String of Mayan date of Gregorian date." 1690 t) 1692 "String of Mayan date of Gregorian date.") 1691 1693 1692 1694 (autoload 'calendar-print-mayan-date "cal-mayan" … … 1731 1733 1732 1734 (autoload 'calendar-chinese-date-string "cal-china" 1733 "String of Chinese date of Gregorian date." 1734 t) 1735 "String of Chinese date of Gregorian date.") 1735 1736 1736 1737 (autoload 'calendar-absolute-from-astro "cal-julian" … … 1742 1743 1743 1744 (autoload 'calendar-astro-date-string "cal-julian" 1744 "String of astronomical (Julian) day number of Gregorian date." 1745 t) 1745 "String of astronomical (Julian) day number of Gregorian date.") 1746 1746 1747 1747 (autoload 'calendar-goto-astro-day-number "cal-julian" … … 1784 1784 1785 1785 (autoload 'calendar-iso-date-string "cal-iso" 1786 "String of ISO date of Gregorian date." 1787 t) 1786 "String of ISO date of Gregorian date.") 1788 1787 1789 1788 (autoload 'calendar-goto-islamic-date "cal-islam" … … 1796 1795 1797 1796 (autoload 'calendar-islamic-date-string "cal-islam" 1798 "String of Islamic date of Gregorian date." 1799 t) 1797 "String of Islamic date of Gregorian date.") 1800 1798 1801 1799 (autoload 'calendar-print-bahai-date "cal-bahai" … … 1804 1802 1805 1803 (autoload 'calendar-bahai-date-string "cal-bahai" 1806 "String of Baha'i date of Gregorian date." 1807 t) 1804 "String of Baha'i date of Gregorian date.") 1808 1805 1809 1806 (autoload 'calendar-goto-hebrew-date "cal-hebrew" … … 1816 1813 1817 1814 (autoload 'calendar-hebrew-date-string "cal-hebrew" 1818 "String of Hebrew date of Gregorian date." 1819 t) 1815 "String of Hebrew date of Gregorian date.") 1820 1816 1821 1817 (autoload 'calendar-goto-coptic-date "cal-coptic" … … 1828 1824 1829 1825 (autoload 'calendar-coptic-date-string "cal-coptic" 1830 "String of Coptic date of Gregorian date." 1831 t) 1826 "String of Coptic date of Gregorian date.") 1832 1827 1833 1828 (autoload 'calendar-goto-ethiopic-date "cal-coptic" … … 1840 1835 1841 1836 (autoload 'calendar-ethiopic-date-string "cal-coptic" 1842 "String of Ethiopic date of Gregorian date." 1843 t) 1837 "String of Ethiopic date of Gregorian date.") 1844 1838 1845 1839 (autoload 'calendar-goto-persian-date "cal-persia" … … 1852 1846 1853 1847 (autoload 'calendar-persian-date-string "cal-persia" 1854 "String of Persian date of Gregorian date." 1855 t) 1856 1857 (autoload 'show-all-diary-entries "diary-lib" 1848 "String of Persian date of Gregorian date.") 1849 1850 (autoload 'diary-show-all-entries "diary-lib" 1858 1851 "Show all of the diary entries in the diary file. 1859 1852 This function gets rid of the selective display of the diary file so that … … 1868 1861 1869 1862 (autoload 'make-diary-entry "diary-lib" 1870 "Insert a diary entry STRING which may be NONMARKING in FILE." 1871 t) 1863 "Insert a diary entry STRING which may be NONMARKING in FILE.") 1872 1864 1873 1865 (autoload 'insert-diary-entry "diary-lib" … … 1954 1946 "Make a buffer with LaTeX commands for the month cursor is on. 1955 1947 Optional prefix argument specifies number of months to be produced. 1956 Calendar is condensed onto one page." )1948 Calendar is condensed onto one page." t) 1957 1949 1958 1950 (autoload 'cal-tex-cursor-month-landscape "cal-tex" 1959 1951 "Make a buffer with LaTeX commands for the month cursor is on. 1960 Optional prefix argument specifies number of months to be produced." )1952 Optional prefix argument specifies number of months to be produced." t) 1961 1953 1962 1954 (autoload 'cal-tex-cursor-day "cal-tex" 1963 "Make a buffer with LaTeX commands for the day cursor is on." )1955 "Make a buffer with LaTeX commands for the day cursor is on." t) 1964 1956 1965 1957 (autoload 'cal-tex-cursor-week "cal-tex" … … 1967 1959 It applies to the week that point is in. 1968 1960 Optional prefix argument specifies number of weeks. 1969 Holidays are included if `cal-tex-holidays' is t." )1961 Holidays are included if `cal-tex-holidays' is t." t) 1970 1962 1971 1963 (autoload 'cal-tex-cursor-week2 "cal-tex" … … 1973 1965 It applies to the week that point is in. 1974 1966 Optional prefix argument specifies number of weeks. 1975 Holidays are included if `cal-tex-holidays' is t." )1967 Holidays are included if `cal-tex-holidays' is t." t) 1976 1968 1977 1969 (autoload 'cal-tex-cursor-week-iso "cal-tex" … … 1979 1971 Optional prefix argument specifies number of weeks. 1980 1972 Diary entries are included if `cal-tex-diary' is t. 1981 Holidays are included if `cal-tex-holidays' is t." )1973 Holidays are included if `cal-tex-holidays' is t." t) 1982 1974 1983 1975 (autoload 'cal-tex-cursor-week-monday "cal-tex" … … 1985 1977 It applies to the week that point is in, and starts on Monday. 1986 1978 Optional prefix argument specifies number of weeks. 1987 Holidays are included if `cal-tex-holidays' is t." )1979 Holidays are included if `cal-tex-holidays' is t." t) 1988 1980 1989 1981 (autoload 'cal-tex-cursor-filofax-2week "cal-tex" … … 1991 1983 Optional prefix argument specifies number of weeks. 1992 1984 Diary entries are included if cal-tex-diary is t. 1993 Holidays are included if `cal-tex-holidays' is t." )1985 Holidays are included if `cal-tex-holidays' is t." t) 1994 1986 1995 1987 (autoload 'cal-tex-cursor-filofax-week "cal-tex" … … 1998 1990 Weeks start on Monday. 1999 1991 Diary entries are included if cal-tex-diary is t. 2000 Holidays are included if `cal-tex-holidays' is t." )1992 Holidays are included if `cal-tex-holidays' is t." t) 2001 1993 2002 1994 (autoload 'cal-tex-cursor-filofax-daily "cal-tex" … … 2004 1996 Optional prefix argument specifies number of weeks. Weeks start on Monday. 2005 1997 Diary entries are included if `cal-tex-diary' is t. 2006 Holidays are included if `cal-tex-holidays' is t." )1998 Holidays are included if `cal-tex-holidays' is t." t) 2007 1999 2008 2000 (autoload 'cal-tex-cursor-year "cal-tex" 2009 2001 "Make a buffer with LaTeX commands for a year's calendar. 2010 Optional prefix argument specifies number of years." )2002 Optional prefix argument specifies number of years." t) 2011 2003 2012 2004 (autoload 'cal-tex-cursor-year-landscape "cal-tex" 2013 2005 "Make a buffer with LaTeX commands for a year's calendar (landscape). 2014 Optional prefix argument specifies number of years." )2006 Optional prefix argument specifies number of years." t) 2015 2007 2016 2008 (autoload 'cal-tex-cursor-filofax-year "cal-tex" 2017 2009 "Make a buffer with LaTeX commands for a year's calendar (Filofax). 2018 Optional prefix argument specifies number of years." )2010 Optional prefix argument specifies number of years." t) 2019 2011 2020 2012 (autoload 'mark-calendar-holidays "holidays" … … 2898 2890 (year (extract-calendar-year date))) 2899 2891 (and (<= 1 month) (<= month 12) 2900 (<= 1 day) (<= day (calendar-last-day-of-month month year)) 2892 ;; (calendar-read-date t) returns a date with day = nil. 2893 ;; Should not be valid (?), since many funcs prob assume integer. 2894 ;; (calendar-read-date 'noday) returns (month year), which 2895 ;; currently results in extract-calendar-year returning nil. 2896 day year (<= 1 day) (<= day (calendar-last-day-of-month month year)) 2901 2897 ;; BC dates left as non-valid, to suppress errors from 2902 2898 ;; complex holiday algorithms not suitable for years BC.
