summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-08-30 11:52:16 +0200
committerBastien Guerry <bzg@altern.org>2012-08-30 11:52:16 +0200
commitb78520e1497d3e7348d90708e148507a7e56232c (patch)
tree36652ae03d9db0393bdd85d20640db64f2d82762
parenta2c4d3e0e969526beca016219162c91d32d4e633 (diff)
downloadorg-mode-b78520e1497d3e7348d90708e148507a7e56232c.tar.gz
org-agenda.el: Fix another bug with `org-agenda-goto-date' with sticky agendas
* org-agenda.el (org-agenda-list): Allow setting the agenda buffer name through a temporary variable. (org-agenda-buffer-tmp-name): New variable to temporary store the agenda buffer name. Thanks to Rainer Stengele for reporting this bug.
-rw-r--r--lisp/org-agenda.el20
1 files changed, 12 insertions, 8 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 2bea9a7..5b8acbb 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -85,7 +85,7 @@
(declare-function org-add-archive-files "org-archive" (files))
(defvar calendar-mode-map) ; defined in calendar.el
-(defvar org-clock-current-task) ; defined in org-clock.el
+(defvar org-clock-current-task nil) ; defined in org-clock.el
(defvar org-mobile-force-id-on-agenda-items) ; defined in org-mobile.el
(defvar org-habit-show-habits) ; defined in org-habit.el
(defvar org-habit-show-habits-only-for-today)
@@ -3859,13 +3859,15 @@ given in `org-agenda-start-on-weekday'."
(if (and (integerp arg) (> arg 0))
(setq span arg arg nil))
(catch 'exit
- (if org-agenda-sticky
- (setq org-agenda-buffer-name
- (cond ((and org-keys (stringp org-match))
- (format "*Org Agenda(%s:%s)*" org-keys org-match))
- (org-keys
- (format "*Org Agenda(%s)*" org-keys))
- (t "*Org Agenda(a)*"))))
+ (setq org-agenda-buffer-name
+ (or org-agenda-buffer-tmp-name
+ (if org-agenda-sticky
+ (cond ((and org-keys (stringp org-match))
+ (format "*Org Agenda(%s:%s)*" org-keys org-match))
+ (org-keys
+ (format "*Org Agenda(%s)*" org-keys))
+ (t "*Org Agenda(a)*")))
+ org-agenda-buffer-name))
(org-agenda-prepare "Day/Week")
(setq start-day (or start-day org-agenda-start-day))
(if (stringp start-day)
@@ -6979,12 +6981,14 @@ Negative selection means regexp must not match for selection of an entry."
(defun org-add-to-string (var string)
(set var (concat (symbol-value var) string)))
+(defvar org-agenda-buffer-tmp-name nil)
(defun org-agenda-goto-date (date)
"Jump to DATE in agenda."
(interactive (list (let ((org-read-date-prefer-future
(eval org-agenda-jump-prefer-future)))
(org-read-date))))
(let ((org-agenda-sticky-orig org-agenda-sticky)
+ (org-agenda-buffer-tmp-name (buffer-name))
org-agenda-sticky)
(org-agenda-list nil date)
(setq org-agenda-sticky org-agenda-sticky-orig