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-09-28 16:51:34 +02:00
parent 132414b11c 807137acdd
commit 16441f6f40
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/org.el
View File

@ -10407,18 +10407,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"))))

2
mk/org-fixup.el
View File

@ -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.
##----------------------------------------------------------------------
")