comparison lisp/calendar/calendar.el @ 73176:3dbfd59b44b5

(european-calendar-style): Call european-calendar or american-calendar as needed when set. (diary-view-entries, list-calendar-holidays): Move autoloads before use.
author Glenn Morris <rgm@gnu.org>
date Sat, 30 Sep 2006 00:20:16 +0000
parents deb64e2d79af
children 97319c05f531
comparison
equal deleted inserted replaced
73175:73c3fffc36e7 73176:3dbfd59b44b5
566 DAY MONTHNAME YEAR 566 DAY MONTHNAME YEAR
567 DAYNAME 567 DAYNAME
568 568
569 Names can be capitalized or not, written in full (as specified by the 569 Names can be capitalized or not, written in full (as specified by the
570 variable `calendar-day-name-array'), or abbreviated (as specified by 570 variable `calendar-day-name-array'), or abbreviated (as specified by
571 `calendar-day-abbrev-array') with or without a period. To take effect, 571 `calendar-day-abbrev-array') with or without a period.
572 this variable should be set before the calendar package and its associates 572
573 are loaded. Otherwise, use one of the functions `european-calendar' or 573 Setting this variable directly does not take effect (if the
574 `american-calendar' to force the appropriate update." 574 calendar package is already loaded). Rather, use either
575 \\[customize] or the functions `european-calendar' and
576 `american-calendar'."
575 :type 'boolean 577 :type 'boolean
578 ;; Without :initialize (require 'calendar) throws an error because
579 ;; american-calendar is undefined at this point.
580 :initialize 'custom-initialize-default
581 :set #'(lambda (symbol value)
582 (if value
583 (european-calendar)
584 (american-calendar)))
585 :require 'calendar
576 :group 'diary) 586 :group 'diary)
577 587
578 ;;;###autoload 588 ;;;###autoload
579 (defcustom american-date-diary-pattern 589 (defcustom american-date-diary-pattern
580 '((month "/" day "[^/0-9]") 590 '((month "/" day "[^/0-9]")
1580 ((equal calendar-setup 'two-frames) (calendar-two-frame-setup arg)) 1590 ((equal calendar-setup 'two-frames) (calendar-two-frame-setup arg))
1581 ((equal calendar-setup 'calendar-only) 1591 ((equal calendar-setup 'calendar-only)
1582 (calendar-only-one-frame-setup arg)) 1592 (calendar-only-one-frame-setup arg))
1583 (t (calendar-basic-setup arg)))) 1593 (t (calendar-basic-setup arg))))
1584 1594
1595 (autoload 'diary-view-entries "diary-lib"
1596 "Prepare and display a buffer with diary entries.
1597 Searches your diary file for entries that match ARG days starting with
1598 the date indicated by the cursor position in the displayed three-month
1599 calendar."
1600 t)
1601
1602 (autoload 'list-calendar-holidays "holidays"
1603 "Create a buffer containing the holidays for the current calendar window.
1604 The holidays are those in the list `calendar-notable-days'. Returns t if any
1605 holidays are found, nil if not."
1606 t)
1607
1585 (defun calendar-basic-setup (&optional arg) 1608 (defun calendar-basic-setup (&optional arg)
1586 "Display a three-month calendar in another window. 1609 "Display a three-month calendar in another window.
1587 The three months appear side by side, with the current month in the middle 1610 The three months appear side by side, with the current month in the middle
1588 surrounded by the previous and next months. The cursor is put on today's date. 1611 surrounded by the previous and next months. The cursor is put on today's date.
1589 1612
1647 (split-height-threshold (if diary-window 2 1000))) 1670 (split-height-threshold (if diary-window 2 1000)))
1648 (if view-calendar-holidays-initially 1671 (if view-calendar-holidays-initially
1649 (list-calendar-holidays))) 1672 (list-calendar-holidays)))
1650 (run-hooks 'initial-calendar-window-hook)) 1673 (run-hooks 'initial-calendar-window-hook))
1651 1674
1652 (autoload 'diary-view-entries "diary-lib"
1653 "Prepare and display a buffer with diary entries.
1654 Searches your diary file for entries that match ARG days starting with
1655 the date indicated by the cursor position in the displayed three-month
1656 calendar."
1657 t)
1658
1659 (autoload 'view-other-diary-entries "diary-lib" 1675 (autoload 'view-other-diary-entries "diary-lib"
1660 "Prepare and display buffer of diary entries from an alternative diary file. 1676 "Prepare and display buffer of diary entries from an alternative diary file.
1661 Searches for entries that match ARG days, starting with the date indicated 1677 Searches for entries that match ARG days, starting with the date indicated
1662 by the cursor position in the displayed three-month calendar. 1678 by the cursor position in the displayed three-month calendar.
1663 D-FILE specifies the file to use as the diary file." 1679 D-FILE specifies the file to use as the diary file."
1926 t) 1942 t)
1927 1943
1928 (autoload 'insert-yearly-bahai-diary-entry "cal-bahai" 1944 (autoload 'insert-yearly-bahai-diary-entry "cal-bahai"
1929 "Insert an annual diary entry for the day of the Baha'i year corresponding 1945 "Insert an annual diary entry for the day of the Baha'i year corresponding
1930 to the date indicated by point." 1946 to the date indicated by point."
1931 t)
1932
1933 (autoload 'list-calendar-holidays "holidays"
1934 "Create a buffer containing the holidays for the current calendar window.
1935 The holidays are those in the list `calendar-notable-days'. Returns t if any
1936 holidays are found, nil if not."
1937 t) 1947 t)
1938 1948
1939 (autoload 'cal-tex-cursor-month "cal-tex" 1949 (autoload 'cal-tex-cursor-month "cal-tex"
1940 "Make a buffer with LaTeX commands for the month cursor is on. 1950 "Make a buffer with LaTeX commands for the month cursor is on.
1941 Optional prefix argument specifies number of months to be produced. 1951 Optional prefix argument specifies number of months to be produced.