From b56acb69ff9b3eb75b5e443b099604939adfe136 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 28 Sep 2012 16:40:00 +0200 Subject: [PATCH 1/2] org-fixup.el (org-make-local-mk): Fix typo in comment * org-fixup.el (org-make-local-mk): Fix typo in comment. --- mk/org-fixup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/org-fixup.el b/mk/org-fixup.el index fcf475322..80439a906 100644 --- a/mk/org-fixup.el +++ b/mk/org-fixup.el @@ -131,7 +131,7 @@ Convenience function for easier invocation from command line." # Remove \"oldorg:\" to switch to \"all\" as the default target. # Change \"oldorg:\" to an existing target to make that target the default, # or define your own target here to become the default target. -oldorg: # do what the old Makfile did by default +oldorg: # do what the old Makefile did by default. ##---------------------------------------------------------------------- ") From 807137acdd2ac001cf70657eba97983d0f51eb63 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 28 Sep 2012 16:51:21 +0200 Subject: [PATCH 2/2] org.el (org-follow-timestamp-link): Fix bug when using sticky agenda * org.el (org-follow-timestamp-link): Fix bug when using sticky agenda. Add a docstring. Thanks to Christoph Lange for reporting this. --- lisp/org.el | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index be8c84cdb..89897a84b 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -10377,18 +10377,24 @@ onto the ring." ;;; Following specific links (defun org-follow-timestamp-link () + "Open an agenda view for the time-stamp date/range at point." (cond ((org-at-date-range-p t) (let ((org-agenda-start-on-weekday) (t1 (match-string 1)) - (t2 (match-string 2))) - (setq t1 (time-to-days (org-time-string-to-time t1)) - t2 (time-to-days (org-time-string-to-time t2))) - (org-agenda-list nil t1 (1+ (- t2 t1))))) + (t2 (match-string 2)) tt1 tt2) + (setq tt1 (time-to-days (org-time-string-to-time t1)) + tt2 (time-to-days (org-time-string-to-time t2))) + (let ((org-agenda-buffer-tmp-name + (format "*Org Agenda(a:%s)" + (concat (substring t1 0 10) "--" (substring t2 0 10))))) + (org-agenda-list nil tt1 (1+ (- tt2 tt1)))))) ((org-at-timestamp-p t) - (org-agenda-list nil (time-to-days (org-time-string-to-time - (substring (match-string 1) 0 10))) - 1)) + (let ((org-agenda-buffer-tmp-name + (format "*Org Agenda(a:%s)" (substring (match-string 1) 0 10)))) + (org-agenda-list nil (time-to-days (org-time-string-to-time + (substring (match-string 1) 0 10))) + 1))) (t (error "This should not happen"))))