[PATCH] Calendar fixes

I'll be committing this shortly. Jeff ChangeLog addition: 2007-07-10 Jeff Miller <jeff.miller(a)xemacs.org&gt; * cal-coptic.el (coptic-prompt-for-date): fix typo (cal-assoc-ignore -> cal-assoc-string) * cal-dst.el, cal-html.el, cal-tex.el, icalendar.el: indentation fixes. * calendar.el: added autoload for calendar-goto-bahai-date * diary-lib.el (diary-mode): use make-hook-local to really make after-save-hook buffer local calendar source patch: Diff command: cvs -q diff -uN Files affected: icalendar.el diary-lib.el calendar.el cal-tex.el cal-html.el cal-dst.el cal-coptic.el Index: cal-coptic.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-coptic.el,v retrieving revision 1.6 diff -u -u -r1.6 cal-coptic.el --- cal-coptic.el 2007/04/16 02:12:24 1.6 +++ cal-coptic.el 2007/07/10 22:41:23 ＠＠ -158,7 +158,7 ＠＠ (calendar-absolute-from-gregorian today)))))) (completion-ignore-case t) ;; XEmacs change, we don't have assoc-string - (month (cdr (cal-assoc-ignore + (month (cdr (cal-assoc-string (completing-read (format "%s calendar month name: " coptic-name) (mapcar 'list Index: cal-dst.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-dst.el,v retrieving revision 1.9 diff -u -u -r1.9 cal-dst.el --- cal-dst.el 2007/04/16 02:12:24 1.9 +++ cal-dst.el 2007/07/10 22:41:23 ＠＠ -50,9 +50,9 ＠＠ current date apply to all years. This is faster, but not always correct, since the dates of daylight saving transitions sometimes change." -:type 'boolean -:version "22.1" -:group 'calendar) +:type 'boolean +:version "22.1" +:group 'calendar) (defvar calendar-current-time-zone-cache nil "Cache for result of `calendar-current-time-zone'.") Index: cal-html.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-html.el,v retrieving revision 1.2 diff -u -u -r1.2 cal-html.el --- cal-html.el 2007/04/16 02:12:25 1.2 +++ cal-html.el 2007/07/10 22:41:23 ＠＠ -37,30 +37,30 ＠＠  (defgroup calendar-html nil "Options for HTML calendars." -:prefix "cal-html-" -:group 'calendar) +:prefix "cal-html-" +:group 'calendar) (defcustom cal-html-directory "~/public_html" "Directory for HTML pages generated by cal-html." -:type 'string -:group 'calendar-html) +:type 'string +:group 'calendar-html) (defcustom cal-html-print-day-number-flag nil "Non-nil means print the day-of-the-year number in the monthly cal-html page." -:type 'boolean -:group 'calendar-html) +:type 'boolean +:group 'calendar-html) (defcustom cal-html-year-index-cols 3 "Number of columns in the cal-html yearly index page." -:type 'integer -:group 'calendar-html) +:type 'integer +:group 'calendar-html) (defcustom cal-html-day-abbrev-array (calendar-abbrev-construct calendar-day-abbrev-array calendar-day-name-array) "Array of seven strings for abbreviated day names (starting with Sunday)." -:type '(vector string string string string string string string) -:group 'calendar-html) +:type '(vector string string string string string string string) +:group 'calendar-html) (defcustom cal-html-css-default (concat ＠＠ -80,8 +80,8 ＠＠ " SPAN.BLOCK { color: #048; font-style: italic; }\n" "</STYLE>\n\n") "Default cal-html css style. You can override this with a \"cal.css\" file." -:type 'string -:group 'calendar-html) +:type 'string +:group 'calendar-html) ;;; End customizable variables. Index: cal-tex.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-tex.el,v retrieving revision 1.7 diff -u -u -r1.7 cal-tex.el --- cal-tex.el 2007/04/16 02:12:26 1.7 +++ cal-tex.el 2007/07/10 22:41:24 ＠＠ -79,8 +79,8 ＠＠ (defcustom cal-tex-rules nil "*If t, pages will be ruled in some styles." -:type 'boolean -:group 'calendar-tex) +:type 'boolean +:group 'calendar-tex) (defcustom cal-tex-daily-string '(let* ((year (extract-calendar-year date)) ＠＠ -127,9 +127,9 ＠＠ "A string giving extra LaTeX commands to insert in the calendar preamble. For example, to include extra packages: \"\\\\usepackage{foo}\\n\\\\usepackage{bar}\\n\"." -:type 'string -:group 'calendar-tex -:version "22.1") +:type 'string +:group 'calendar-tex +:version "22.1") (defcustom cal-tex-hook nil "*List of functions called after any LaTeX calendar buffer is generated. ＠＠ -137,28 +137,28 ＠＠ characters with diacritical marks to their LaTeX equivalents, use (add-hook 'cal-tex-hook '(lambda () (iso-iso2tex (point-min) (point-max))))" -:type 'hook -:group 'calendar-tex) +:type 'hook +:group 'calendar-tex) (defcustom cal-tex-year-hook nil "*List of functions called after a LaTeX year calendar buffer is generated." -:type 'hook -:group 'calendar-tex) +:type 'hook +:group 'calendar-tex) (defcustom cal-tex-month-hook nil "*List of functions called after a LaTeX month calendar buffer is generated." -:type 'hook -:group 'calendar-tex) +:type 'hook +:group 'calendar-tex) (defcustom cal-tex-week-hook nil "*List of functions called after a LaTeX week calendar buffer is generated." -:type 'hook -:group 'calendar-tex) +:type 'hook +:group 'calendar-tex) (defcustom cal-tex-daily-hook nil "*List of functions called after a LaTeX daily calendar buffer is generated." -:type 'hook -:group 'calendar-tex) +:type 'hook +:group 'calendar-tex) ;;; ;;; Definitions for LaTeX code ＠＠ -905,6 +905,7 ＠＠ (insert ", ") (cal-tex-large-bf (cal-tex-month-name month)) (insert " ") + (cal-tex-large-bf (number-to-string day)) (if (not (string= "" (cal-tex-latexify-list holidays date))) (progn Index: calendar.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/calendar.el,v retrieving revision 1.15 diff -u -u -r1.15 calendar.el --- calendar.el 2007/04/16 02:12:26 1.15 +++ calendar.el 2007/07/10 22:41:24 ＠＠ -1862,6 +1862,10 ＠＠ "Move cursor to Persian date." t) +(autoload 'calendar-goto-bahai-date "cal-bahai" + "Move cursor to Baha'i date." + t) + (autoload 'calendar-print-persian-date "cal-persia" "Show the Persian date equivalents of date." t) Index: diary-lib.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/diary-lib.el,v retrieving revision 1.9 diff -u -u -r1.9 diary-lib.el --- diary-lib.el 2007/04/16 02:12:27 1.9 +++ diary-lib.el 2007/07/10 22:41:24 ＠＠ -1922,6 +1922,10 ＠＠ (set (make-local-variable 'font-lock-defaults) '(diary-font-lock-keywords t)) (add-to-invisibility-spec '(diary . nil)) + ;; XEmacs change - the "local" option for add-hook does not work the + ;; same as Emacs, we need to use make-local-hook to make the hook + ;; local. + (make-local-hook 'after-save-hook) (add-hook 'after-save-hook 'diary-redraw-calendar nil t) (if diary-header-line-flag (setq header-line-format diary-header-line-format))) Index: icalendar.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/icalendar.el,v retrieving revision 1.3 diff -u -u -r1.3 icalendar.el --- icalendar.el 2007/04/16 02:12:27 1.3 +++ icalendar.el 2007/07/10 22:41:25 ＠＠ -111,8 +111,8 ＠＠ ;; ====================================================================== (defgroup icalendar nil "Icalendar support." -:prefix "icalendar-" -:group 'calendar) +:prefix "icalendar-" +:group 'calendar) (defcustom icalendar-import-format "%s%d%l%o" ＠＠ -126,64 +126,64 ＠＠ %s Summary, see `icalendar-import-format-summary' %t Status, see `icalendar-import-format-status' %u URL, see `icalendar-import-format-url'" -:type 'string -:group 'icalendar) +:type 'string +:group 'icalendar) (defcustom icalendar-import-format-summary "%s" "Format string defining how the summary element is formatted. This applies only if the summary is not empty! `%s' is replaced by the summary." -:type 'string -:group 'icalendar) +:type 'string +:group 'icalendar) (defcustom icalendar-import-format-description "\n Desc: %s" "Format string defining how the description element is formatted. This applies only if the description is not empty! `%s' is replaced by the description." -:type 'string -:group 'icalendar) +:type 'string +:group 'icalendar) (defcustom icalendar-import-format-location "\n Location: %s" "Format string defining how the location element is formatted. This applies only if the location is not empty! `%s' is replaced by the location." -:type 'string -:group 'icalendar) +:type 'string +:group 'icalendar) (defcustom icalendar-import-format-organizer "\n Organizer: %s" "Format string defining how the organizer element is formatted. This applies only if the organizer is not empty! `%s' is replaced by the organizer." -:type 'string -:group 'icalendar) +:type 'string +:group 'icalendar) (defcustom icalendar-import-format-url "\n URL: %s" "Format string defining how the URL element is formatted. This applies only if the URL is not empty! `%s' is replaced by the URL." -:type 'string -:group 'icalendar) +:type 'string +:group 'icalendar) (defcustom icalendar-import-format-status "\n Status: %s" "Format string defining how the status element is formatted. This applies only if the status is not empty! `%s' is replaced by the status." -:type 'string -:group 'icalendar) +:type 'string +:group 'icalendar) (defcustom icalendar-import-format-class "\n Class: %s" "Format string defining how the class element is formatted. This applies only if the class is not empty! `%s' is replaced by the class." -:type 'string -:group 'icalendar) +:type 'string +:group 'icalendar) (defvar icalendar-debug nil "Enable icalendar debug messages.") _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches