summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-04-13 11:46:16 +0200
committerBastien Guerry <bzg@altern.org>2013-04-13 11:46:16 +0200
commit4a603bcd28876cf44a7bb584850df0bfe79f481b (patch)
treec662357d3c5278015aebd887340956367a7118d7
parent13deb41a3a2b2e7f52a89fda0e29d284903f02a3 (diff)
downloadorg-mode-4a603bcd28876cf44a7bb584850df0bfe79f481b.tar.gz
org-agenda.el (org-timeline): Handle `org-agenda-show-log'
* org-agenda.el (org-timeline): Handle `org-agenda-show-log'. Thanks to Derek Upham for reporting this bug.
-rw-r--r--lisp/org-agenda.el14
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index e72d7e9..fcaec26 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3979,6 +3979,7 @@ dates."
(interactive "P")
(let* ((dopast t)
(org-agenda-show-log-scoped org-agenda-show-log)
+ (org-agenda-show-log org-agenda-show-log-scoped)
(entry (buffer-file-name (or (buffer-base-buffer (current-buffer))
(current-buffer))))
(date (calendar-current-date))
@@ -3995,9 +3996,11 @@ dates."
args
s e rtn d emptyp)
(setq org-agenda-redo-command
- (list 'progn
- (list 'org-switch-to-buffer-other-window (current-buffer))
- (list 'org-timeline (list 'quote dotodo))))
+ (list 'let
+ (list (list 'org-agenda-show-log 'org-agenda-show-log))
+ (list 'org-switch-to-buffer-other-window (current-buffer))
+ (list 'org-timeline (list 'quote dotodo))))
+ (put 'org-agenda-redo-command 'org-lprops nil)
(if (not dopast)
;; Remove past dates from the list of dates.
(setq day-numbers (delq nil (mapcar (lambda(x)
@@ -4050,10 +4053,11 @@ dates."
(put-text-property s (1- (point)) 'org-today t))
(and rtn (insert (org-agenda-finalize-entries rtn 'timeline) "\n"))
(put-text-property s (1- (point)) 'day d)))))
- (goto-char (point-min))
(goto-char (or (text-property-any (point-min) (point-max) 'org-today t)
(point-min)))
- (add-text-properties (point-min) (point-max) '(org-agenda-type timeline))
+ (add-text-properties
+ (point-min) (point-max)
+ `(org-agenda-type timeline org-redo-cmd ,org-agenda-redo-command))
(org-agenda-finalize)
(setq buffer-read-only t)))