mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-26 02:32:52 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2012-08-30 10:10:27 +02:00
parent c48f322b55 b74140e1b0
commit ae87d2933c
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/org-agenda.el
View file

@ -4883,9 +4883,7 @@ 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))
;; Prevent `org-compile-prefix-format' to fail when there is no agenda
(when (buffer-live-p org-agenda-buffer)
(org-compile-prefix-format 'agenda))
(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))
@ -6182,7 +6180,7 @@ and stored in the variable `org-prefix-format-compiled'."
(setq s (replace-match "%s" t nil s))
(push varform vars))
(setq vars (nreverse vars))
(with-current-buffer org-agenda-buffer
(with-current-buffer (or org-agenda-buffer (current-buffer))
(setq org-prefix-format-compiled
(list
`((org-prefix-has-time ,org-prefix-has-time)