# HG changeset patch # User Glenn Morris # Date 1205387275 0 # Node ID 26dc958b293b38e1a00966ce6776f602a53ec7f8 # Parent 2bcff1e54131512c80272a42edd4e8c6ca16ee64 (calendar-holiday-list, diary-list-entries, calendar-iso-from-absolute): Fix autoloads. (generated-autoload-file): Don't set, instead use different values of generate-autoload-cookie plus Makefile rules to allow for a mixture of internal calendar autoloads and normal autoloads. diff -r 2bcff1e54131 -r 26dc958b293b lisp/calendar/cal-tex.el --- a/lisp/calendar/cal-tex.el Thu Mar 13 05:46:32 2008 +0000 +++ b/lisp/calendar/cal-tex.el Thu Mar 13 05:47:55 2008 +0000 @@ -60,10 +60,6 @@ (require 'calendar) -(autoload 'diary-list-entries "diary-lib" nil t) -(autoload 'calendar-holiday-list "holidays" nil t) -(autoload 'calendar-iso-from-absolute "cal-iso" nil t) - ;;; ;;; Customizable variables ;;; @@ -241,6 +237,8 @@ "LaTeX code to insert one box with date info in calendar. This definition is the heart of the calendar!") +(autoload 'calendar-holiday-list "holidays") + (defun cal-tex-list-holidays (d1 d2) "Generate a list of all holidays from absolute date D1 to D2." (let* ((start (calendar-gregorian-from-absolute d1)) @@ -265,6 +263,8 @@ (setq in-range (append (list hol) in-range)))) in-range)) +(autoload 'diary-list-entries "diary-lib") + (defun cal-tex-list-diary-entries (d1 d2) "Generate a list of all diary-entries from absolute date D1 to D2." (let ((diary-list-include-blanks nil) @@ -312,7 +312,7 @@ ;;; Yearly calendars ;;; -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-year (&optional arg) "Make a buffer with LaTeX commands for the year cursor is on. Optional prefix argument ARG specifies number of years." @@ -320,7 +320,7 @@ (cal-tex-year (extract-calendar-year (calendar-cursor-to-date t)) (or arg 1))) -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-year-landscape (&optional arg) "Make a buffer with LaTeX commands for the year cursor is on. Optional prefix argument ARG specifies number of years." @@ -364,7 +364,7 @@ (run-hooks 'cal-tex-year-hook)) (run-hooks 'cal-tex-hook)) -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-filofax-year (&optional arg) "Make a Filofax one page yearly calendar of year indicated by cursor. Optional prefix argument ARG specifies number of years." @@ -417,7 +417,7 @@ ;;; Monthly calendars ;;; -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-month-landscape (&optional arg) "Make a LaTeX calendar buffer for the month the cursor is on. Optional prefix argument ARG specifies number of months to be @@ -486,7 +486,7 @@ (cal-tex-end-document) (run-hooks 'cal-tex-hook)))) -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-month (arg) "Make a LaTeX calendar buffer for the month the cursor is on. Optional prefix argument ARG specifies number of months to be @@ -672,7 +672,7 @@ ;; TODO cal-tex-diary-support. ;; TODO respect cal-tex-daily-start,end (see cal-tex-week-hours). -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-week (&optional arg) "Make a LaTeX calendar buffer for a two-page one-week calendar. It applies to the week that point is in. The optional prefix @@ -725,7 +725,7 @@ ;; TODO cal-tex-diary support. ;; TODO respect cal-tex-daily-start,end (see cal-tex-week-hours). -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-week2 (&optional arg) "Make a LaTeX calendar buffer for a two-page one-week calendar. It applies to the week that point is in. Optional prefix @@ -805,7 +805,9 @@ (cal-tex-end-document) (run-hooks 'cal-tex-hook))) -;;;###autoload +(autoload 'calendar-iso-from-absolute "cal-iso") + +;;;###cal-autoload (defun cal-tex-cursor-week-iso (&optional arg) "Make a LaTeX calendar buffer for a one page ISO-style weekly calendar. Optional prefix argument ARG specifies number of weeks (default 1). @@ -937,7 +939,7 @@ ;; TODO cal-tex-diary support. ;; TODO respect cal-tex-daily-start,end (see cal-tex-weekly4-box). -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-week-monday (&optional arg) "Make a LaTeX calendar buffer for a two-page one-week calendar. It applies to the week that point is in, and starts on Monday. @@ -1018,7 +1020,7 @@ (cal-tex-e-framebox) (cal-tex-hspace "1cm"))) -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-filofax-2week (&optional arg) "Two-weeks-at-a-glance Filofax style calendar for week cursor is in. Optional prefix argument ARG specifies number of weeks (default 1). @@ -1113,7 +1115,7 @@ (cal-tex-end-document) (run-hooks 'cal-tex-hook))) -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-filofax-week (&optional arg) "One-week-at-a-glance Filofax style calendar for week indicated by cursor. Optional prefix argument ARG specifies number of weeks (default 1), @@ -1253,7 +1255,7 @@ (cal-tex-end-document) (run-hooks 'cal-tex-hook))) -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-filofax-daily (&optional arg) "Day-per-page Filofax style calendar for week indicated by cursor. Optional prefix argument ARG specifies number of weeks (default 1), @@ -1367,7 +1369,7 @@ ;;; Daily calendars ;;; -;;;###autoload +;;;###cal-autoload (defun cal-tex-cursor-day (&optional arg) "Make a buffer with LaTeX commands for the day cursor is on. Optional prefix argument ARG specifies number of days. The calendar shows @@ -1806,9 +1808,5 @@ (provide 'cal-tex) -;; Local Variables: -;; generated-autoload-file: "cal-loaddefs.el" -;; End: - ;; arch-tag: ca8168a4-5a00-4508-a565-17e3bccce6d0 ;;; cal-tex.el ends here