comparison lisp/calendar/calendar.el @ 4453:7f41b3648380

(diary-display-hook): Change default and fix doc string. (diary-hook): New user variable. (diary-date-forms, calendar-date-display-form): Don't autoload them so the European/American style is decided at load time.
author Richard M. Stallman <rms@gnu.org>
date Wed, 04 Aug 1993 23:02:10 +0000
parents 2b1aa3183d79
children c14a75fce9c9
comparison
equal deleted inserted replaced
4452:9b4b1220bfe5 4453:7f41b3648380
376 (day " *" monthname " *" year "[^0-9]") 376 (day " *" monthname " *" year "[^0-9]")
377 (dayname "\\W")) 377 (dayname "\\W"))
378 "*List of pseudo-patterns describing the European patterns of date used. 378 "*List of pseudo-patterns describing the European patterns of date used.
379 See the documentation of diary-date-forms for an explanation.") 379 See the documentation of diary-date-forms for an explanation.")
380 380
381 ;;;###autoload
382 (defvar diary-date-forms 381 (defvar diary-date-forms
383 (if european-calendar-style 382 (if european-calendar-style
384 european-date-diary-pattern 383 european-date-diary-pattern
385 american-date-diary-pattern) 384 american-date-diary-pattern)
386 "*List of pseudo-patterns describing the forms of date used in the diary. 385 "*List of pseudo-patterns describing the forms of date used in the diary.
416 (defvar american-calendar-display-form 415 (defvar american-calendar-display-form
417 '((if dayname (concat dayname ", ")) monthname " " day ", " year) 416 '((if dayname (concat dayname ", ")) monthname " " day ", " year)
418 "*Pseudo-pattern governing the way a date appears in the American style. 417 "*Pseudo-pattern governing the way a date appears in the American style.
419 See the documentation of calendar-date-display-forms for an explanation.") 418 See the documentation of calendar-date-display-forms for an explanation.")
420 419
421 ;;;###autoload
422 (defvar calendar-date-display-form 420 (defvar calendar-date-display-form
423 (if european-calendar-style 421 (if european-calendar-style
424 european-calendar-display-form 422 european-calendar-display-form
425 american-calendar-display-form) 423 american-calendar-display-form)
426 "*Pseudo-pattern governing the way a date appears. 424 "*Pseudo-pattern governing the way a date appears.
495 in your .emacs file to cause the fancy diary buffer to be displayed with 493 in your .emacs file to cause the fancy diary buffer to be displayed with
496 diary entries from various included files, each day's entries sorted into 494 diary entries from various included files, each day's entries sorted into
497 lexicographic order.") 495 lexicographic order.")
498 496
499 ;;;###autoload 497 ;;;###autoload
500 (defvar diary-display-hook 'simple-diary-display 498 (defvar diary-hook nil
499 "*List of functions called after the display of the diary.
500 Can be used for appointment notification.")
501
502 ;;;###autoload
503 (defvar diary-display-hook nil
501 "*List of functions that handle the display of the diary. 504 "*List of functions that handle the display of the diary.
505 If nil (the default), `simple-diary-display' will be used. Use `ignore' for no
506 diary display.
502 507
503 Ordinarily, this just displays the diary buffer (with holidays indicated in 508 Ordinarily, this just displays the diary buffer (with holidays indicated in
504 the mode line), if there are any relevant entries. At the time these 509 the mode line), if there are any relevant entries. At the time these
505 functions are called, the variable `diary-entries-list' is a list, in order 510 functions are called, the variable `diary-entries-list' is a list, in order
506 by date, of all relevant diary entries in the form of ((MONTH DAY YEAR) 511 by date, of all relevant diary entries in the form of ((MONTH DAY YEAR)
507 STRING), where string is the diary entry for the given date. This can be 512 STRING), where string is the diary entry for the given date. This can be
508 used, for example, to handle appointment notification, prepare a different 513 used, for example, a different buffer for display (perhaps combined with
509 buffer for display (perhaps combined with holidays), or produce hard copy 514 holidays), or produce hard copy output.
510 output.
511 515
512 A function `fancy-diary-display' is provided as an alternative 516 A function `fancy-diary-display' is provided as an alternative
513 choice for this hook; this function prepares a special noneditable diary 517 choice for this hook; this function prepares a special noneditable diary
514 buffer with the relevant diary entries that has neat day-by-day arrangement 518 buffer with the relevant diary entries that has neat day-by-day arrangement
515 with headings. The fancy diary buffer will show the holidays unless the 519 with headings. The fancy diary buffer will show the holidays unless the