From b74140e1b00113f718c4bb990e0c8dd49eb7dd38 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 30 Aug 2012 10:10:18 +0200 Subject: [PATCH] =?UTF-8?q?org-agenda.el:=20Unconditionnally=20set=20?= =?UTF-8?q?=CC=80org-compile-prefix-format'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * org-agenda.el (org-diary): Don't check whether there is an agenda buffer when trying to compile the prefix format. (org-compile-prefix-format): Check if there is an agenda buffer. If not, use the current buffer. --- lisp/org-agenda.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 8b1fd7c64..35d9daba9 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -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)) @@ -6180,7 +6178,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)