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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-08-26 23:24:50 +02:00
parent bb1c99a470 d832837693
commit 7f01035de0
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lisp/org-agenda.el
View File

@ -1852,18 +1852,6 @@ works you probably want to add it to `org-agenda-custom-commands' for good."
;;; Multiple agenda buffers support ;;; Multiple agenda buffers support
(defcustom org-agenda-sticky nil
"Non-nil means agenda q key will bury agenda buffers.
Agenda commands will then show existing buffer instead of generating new ones.
When nil, `q' will kill the single agenda buffer."
:group 'org-agenda
:type 'boolean
:set (lambda (var val)
(if (boundp var)
(org-toggle-sticky-agenda (if val 1 0))
(set var val))))
(defun org-toggle-sticky-agenda (&optional arg) (defun org-toggle-sticky-agenda (&optional arg)
"Toggle `org-agenda-sticky'." "Toggle `org-agenda-sticky'."
(interactive "P") (interactive "P")
@ -1880,6 +1868,17 @@ When nil, `q' will kill the single agenda buffer."
(message "Sticky agenda was %s" (message "Sticky agenda was %s"
(if org-agenda-sticky "enabled" "disabled")))))) (if org-agenda-sticky "enabled" "disabled"))))))
(defcustom org-agenda-sticky nil
"Non-nil means agenda q key will bury agenda buffers.
Agenda commands will then show existing buffer instead of generating new ones.
When nil, `q' will kill the single agenda buffer."
:group 'org-agenda
:type 'boolean
:set (lambda (var val)
(if (boundp var)
(org-toggle-sticky-agenda (if val 1 0))
(set var val))))
(defvar org-agenda-buffer nil (defvar org-agenda-buffer nil
"Agenda buffer currently being generated.") "Agenda buffer currently being generated.")