[O] [PATCH 3/3] org-capture.el: Add support for week trees.

[Rüdiger Sonderfeld]

* lisp/org-capture.el (org-capture-templates): Add
  file+weektree(+prompt) options.
  (org-capture-set-target-location): Add support for week trees.
* doc/org.texi (Template elements): Document file+weektree(+prompt)
  options.
---
 doc/org.texi        |  7 +++++++
 lisp/org-capture.el | 26 +++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/doc/org.texi b/doc/org.texi
index ed808be..d894f91 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -7187,6 +7187,13 @@
 @item (file+datetree+prompt "path/to/file")
 Will create a heading in a date tree, but will prompt for the date.
 
address@hidden (file+weektree "path/to/file")
+Will create a heading in a week tree for today's date.  Week trees are sorted
+by week and not by month unlike datetrees.
+
address@hidden (file+weektree+prompt "path/to/file")
+Will create a heading in a week tree, but will prompt for the date.
+
 @item (file+function "path/to/file" function-finding-location)
 A function to find the right location in the file.
 
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 93a7f2a..320954e 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -149,6 +149,12 @@ (defcustom org-capture-templates nil
              (file+datetree+prompt \"path/to/file\")
                  Will create a heading in a date tree, prompts for date
 
+             (file+weektree \"path/to/file\")
+                 Will create a heading in a week tree for today's date
+
+             (file+weektree+prompt \"path/to/file\")
+                 Will create a heading in a week tree, prompts for date
+
              (file+function \"path/to/file\" function-finding-location)
                  A function to find the right location in the file
 
@@ -321,6 +327,12 @@ (defcustom org-capture-templates nil
                          (list :tag "File & Date tree, prompt for date"
                                (const :format "" file+datetree+prompt)
                                (file :tag "  File"))
+                         (list :tag "File & Week tree"
+                               (const :format "" file+weektree)
+                               (file :tag "  File"))
+                         (list :tag "File & Week tree, prompt for date"
+                               (const :format "" file+weektree+prompt)
+                               (file :tag "  File"))
                          (list :tag "File & function"
                                (const :format "" file+function)
                                (file :tag "  File    ")
@@ -895,21 +907,25 @@ (defun org-capture-set-target-location (&optional target)
              (setq target-entry-p (and (derived-mode-p 'org-mode) 
(org-at-heading-p))))
          (error "No match for target regexp in file %s" (nth 1 target))))
 
-       ((memq (car target) '(file+datetree file+datetree+prompt))
+       ((memq (car target) '(file+datetree file+datetree+prompt file+weektree 
file+weektree+prompt))
        (require 'org-datetree)
        (set-buffer (org-capture-target-buffer (nth 1 target)))
        (org-capture-put-target-region-and-position)
        (widen)
-       ;; Make a date tree entry, with the current date (or yesterday,
-       ;; if we are extending dates for a couple of hours)
-       (org-datetree-find-date-create
+       ;; Make a date/week tree entry, with the current date (or
+       ;; yesterday, if we are extending dates for a couple of hours)
+       (funcall
+        (cond
+         ((memq (car target) '(file+weektree file+weektree+prompt))
+          #'org-datetree-find-iso-week-create)
+         (t #'org-datetree-find-date-create))
         (calendar-gregorian-from-absolute
          (cond
           (org-overriding-default-time
            ;; use the overriding default time
            (time-to-days org-overriding-default-time))
 
-          ((eq (car target) 'file+datetree+prompt)
+          ((memq (car target) '(file+datetree+prompt file+weektree+prompt))
            ;; prompt for date
            (let ((prompt-time (org-read-date
                                nil t nil "Date for tree entry:"
-- 
2.5.1