tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'fix-org-diary-bug' into fix-compiler-warnings

This commit is contained in:
Bastien Guerry 2012-04-28 22:23:40 +02:00
parent c5f73635d0 4b8359a395
commit 982b7b972f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org-agenda.el
View File

@ -4747,7 +4747,8 @@ function from a program - use `org-agenda-get-day-entries' instead."
;; I am not sure if this works with sticky agendas, because the marker
;; list is then no longer a global variable.
(org-agenda-reset-markers))
(org-compile-prefix-format 'agenda)
;; Prevent `org-compile-prefix-format' to fail when there is no agenda
(when org-agenda-buffer (org-compile-prefix-format 'agenda))
(org-set-sorting-strategy 'agenda)
(setq args (or args '(:deadline :scheduled :timestamp :sexp)))
(let* ((files (if (and entry (stringp entry) (string-match "\\S-" entry))