ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org-agenda.el: Set `org-agenda-buffer-name' correctly in `org-agenda' 

* org-agenda.el (org-agenda): Set `org-agenda-buffer-name'
correctly with sticky agendas and non-custom commands.
This commit is contained in:
Bastien Guerry 2012-08-28 14:37:33 +02:00
parent 529a3346ce
commit 111bfa90d5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/org-agenda.el
View File

@ -2460,6 +2460,12 @@ Pressing `<' twice means to restrict to the current subtree or region
(setq ans (org-agenda-get-restriction-and-command prefix-descriptions) (setq ans (org-agenda-get-restriction-and-command prefix-descriptions)
keys (car ans) keys (car ans)
restriction (cdr ans))) restriction (cdr ans)))
;; If we have sticky agenda buffers, set a name for the buffer,
;; depending on the invoking keys. The user may still set this
;; as a command option, which will overwrite what we do here.
(if org-agenda-sticky
(setq org-agenda-buffer-name
(format "*Org Agenda(%s)*" keys)))
;; Establish the restriction, if any ;; Establish the restriction, if any
(when (and (not org-agenda-overriding-restriction) restriction) (when (and (not org-agenda-overriding-restriction) restriction)
(put 'org-agenda-files 'org-restrict (list bfn)) (put 'org-agenda-files 'org-restrict (list bfn))
@ -2483,9 +2489,6 @@ Pressing `<' twice means to restrict to the current subtree or region
(progn (progn
(setq type (nth 2 entry) match (eval (nth 3 entry)) (setq type (nth 2 entry) match (eval (nth 3 entry))
lprops (nth 4 entry)) lprops (nth 4 entry))
;; If we have sticky agenda buffers, set a name for the buffer,
;; depending on the invoking keys. The user may still set this
;; as a command option, which will overwrite what we do here.
(if org-agenda-sticky (if org-agenda-sticky
(setq org-agenda-buffer-name (setq org-agenda-buffer-name
(or (and (stringp match) (format "*Org Agenda(%s:%s)*" keys match)) (or (and (stringp match) (format "*Org Agenda(%s:%s)*" keys match))
@ -3874,7 +3877,7 @@ given in `org-agenda-start-on-weekday'."
(format "*Org Agenda(%s:%s)*" keys match)) (format "*Org Agenda(%s:%s)*" keys match))
(keys (keys
(format "*Org Agenda(%s)*" keys)) (format "*Org Agenda(%s)*" keys))
(t (format "*Org Agenda(a)*"))))) (t "*Org Agenda(a)*"))))
(org-agenda-prepare "Day/Week") (org-agenda-prepare "Day/Week")
(setq start-day (or start-day org-agenda-start-day)) (setq start-day (or start-day org-agenda-start-day))
(if org-agenda-overriding-arguments (if org-agenda-overriding-arguments