diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-09-15 02:34:54 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-09-15 02:34:54 +0000 |
| commit | 2b8e87c4693dd1ffab7d9c4bd1adb7290fef1759 (patch) | |
| tree | 63c20ae81a4e473dba15eecf5113f5a7777ecbaa /lisp/calendar | |
| parent | c276856990ea90210a2b446e710f29102e45ac25 (diff) | |
| download | emacs-2b8e87c4693dd1ffab7d9c4bd1adb7290fef1759.tar.gz | |
(diary-display-function): Change the default to fancy display.
(body): Define for compiler.
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/diary-lib.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 3beb3548a35..6f73c1048dd 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -151,10 +151,9 @@ Used for example by the appointment package - see `appt-activate'." (define-obsolete-variable-alias 'diary-display-hook 'diary-display-function "23.1") -(defcustom diary-display-function 'diary-simple-display +(defcustom diary-display-function 'diary-fancy-display "Function used to display the diary. -The default is `diary-simple-display'; `diary-fancy-display' is -an alternative. +The two standard options are `diary-fancy-display' and `diary-simple-display'. For historical reasons, `nil' is the same as `diary-simple-display' \(so you must use `ignore' for no display). Also for historical @@ -167,14 +166,14 @@ form of ((MONTH DAY YEAR) STRING), where string is the diary entry for the given date. This can be used, for example, to produce a different buffer for display (perhaps combined with holidays), or hard copy output." - :type '(choice (const diary-simple-display :tag "Basic display") - (const diary-fancy-display :tag "Fancy display") + :type '(choice (const diary-fancy-display :tag "Fancy display") + (const diary-simple-display :tag "Basic display") (const ignore :tag "No display") (const nil :tag "Obsolete way to choose basic display") (hook :tag "Obsolete form with list of display functions")) :initialize 'custom-initialize-default :set 'diary-set-maybe-redraw - :version "23.1" + :version "23.2" ; simple->fancy :group 'diary) (define-obsolete-variable-alias 'list-diary-entries-hook @@ -2381,6 +2380,7 @@ Fontify the region between BEG and END, quietly unless VERBOSE is non-nil." ;; `diary-outlook-formats'. (defvar subject) ; bound in diary-from-outlook-gnus +(defvar body) (defun diary-from-outlook-internal (&optional test-only) "Snarf a diary entry from a message assumed to be from MS Outlook. |