procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(org-get-entries-from-diary): Also set diary-display-function.

Browse source
This commit is contained in:
Glenn Morris 2008-05-30 03:00:19 +00:00
parent a02717ccd4
commit ca8ef0dc04
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lisp/ChangeLog
View file

@ -1,3 +1,31 @@
2008-05-30 Glenn Morris <rgm@gnu.org>
* Makefile.in (update-elclist): Hide the warning when it does not apply,
make it milder when it does.
(autogen-clean): New target.
(maintainer-clean): Use autogen-clean.
* calendar/diary-lib.el (diary-display-function): New name for
diary-display-hook. Keep old name as obsolete alias. Doc fix.
Change custom type and version.
(diary-list-entries-hook, diary-list-entries, diary-simple-display)
(diary-fancy-display): Doc fixes.
(diary-list-entries, diary-include-other-diary-files)
(diary-mail-entries):
Use diary-display-function rather than diary-display-hook.
* calendar/appt.el (appt-check): Use diary-display-function rather than
diary-display-hook.
* calendar/cal-x.el (calendar-dedicate-diary): Update for
diary-display-function replacing diary-display-hook.
* org/org-agenda.el (org-get-entries-from-diary): Also set
diary-display-function.
* calendar/cal-html.el (cal-html-list-diary-entries):
* calendar/cal-menu.el (calendar-mouse-view-diary-entries):
* calendar/cal-tex.el (cal-tex-list-diary-entries): Use LIST-ONLY
argument of diary-list-entries rather than setting diary-display-hook.
2008-05-30 Kenichi Handa <handa@m17n.org>
* international/mule-diag.el (describe-font): Don't check fontset

4
lisp/org/org-agenda.el
View file

@ -1,6 +1,7 @@
;;; org-agenda.el --- The table editor for Org-mode
;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Copyright (C) 2004, 2005, 2006, 2007, 2008
;; Free Software Foundation, Inc.
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
@ -2837,6 +2838,7 @@ MATCH is being ignored."
(let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*")
(fancy-diary-buffer diary-fancy-buffer)
(diary-display-hook '(fancy-diary-display))
(diary-display-function 'fancy-diary-display)
(pop-up-frames nil)
(list-diary-entries-hook
(cons 'org-diary-default-entry list-diary-entries-hook))