2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>

[bpt/emacs.git] / lisp / org / org-remember.el

diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 708c8e9..5eef7a2 100644 (file)
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.31a
+;; Version: 6.33
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -34,6 +34,7 @@
 (eval-when-compile
   (require 'cl))
 (require 'org)
+(require 'org-datetree)
 
 (declare-function remember-mode "remember" ())
 (declare-function remember "remember" (&optional initial))
@@ -189,7 +190,8 @@ calendar           |  %:type %:date"
                 (function :tag "Function")
                 (const :tag "Use `org-remember-default-headline'" nil)
                 (const :tag "At beginning of file" top)
-                (const :tag "At end of file" bottom))
+                (const :tag "At end of file" bottom)
+                (const :tag "In a date tree" date-tree))
                (choice :tag "Context"
                 (const :tag "Use in all contexts" nil)
                 (const :tag "Use in all contexts" t)
@@ -296,6 +298,7 @@ RET at beg-of-buf -> Append to file as level 2 headline
 
 (defvar org-jump-to-target-location nil)
 (defvar org-remember-previous-location nil)
+(defvar org-remember-reference-date nil)
 (defvar org-force-remember-template-char) ;; dynamically scoped
 
 ;; Save the major mode of the buffer we called remember from
@@ -534,6 +537,8 @@ to be run from that hook to function properly."
            (org-set-local 'org-default-notes-file file))
        (if headline
            (org-set-local 'org-remember-default-headline headline))
+       (org-set-local 'org-remember-reference-date
+                      (list (nth 4 dct) (nth 3 dct) (nth 5 dct)))
        ;; Interactive template entries
        (goto-char (point-min))
        (while (re-search-forward "%^\\({\\([^}]*\\)}\\)?\\([gGtTuUCLp]\\)?" nil t)
@@ -588,12 +593,14 @@ to be run from that hook to function properly."
                   (pall (concat prop "_ALL"))
                   (allowed
                    (with-current-buffer
-                       (get-buffer (file-name-nondirectory file))
+                       (or (find-buffer-visiting file)
+                           (find-file-noselect file))
                      (or (cdr (assoc pall org-file-properties))
                          (cdr (assoc pall org-global-properties))
                          (cdr (assoc pall org-global-properties-fixed)))))
                   (existing (with-current-buffer
-                                (get-buffer (file-name-nondirectory file))
+                                (or (find-buffer-visiting file)
+                                    (find-file-noselect file))
                               (mapcar 'list (org-property-values prop))))
                   (propprompt (concat "Value for " prop ": "))
                   (val (if allowed
@@ -614,11 +621,12 @@ to be run from that hook to function properly."
                                     nil nil (list org-end-time-was-given)))
             (t
              (let (org-completion-use-ido)
-               (insert (org-completing-read-no-i
-                        (concat (if prompt prompt "Enter string")
-                                (if default (concat " [" default "]"))
-                                ": ")
-                        completions nil nil nil histvar default)))))))
+               (insert (org-without-partial-completion
+                        (org-completing-read-no-i
+                         (concat (if prompt prompt "Enter string")
+                                 (if default (concat " [" default "]"))
+                                 ": ")
+                         completions nil nil nil histvar default))))))))
 
        (goto-char (point-min))
        (if (re-search-forward "%\\?" nil t)
@@ -848,6 +856,7 @@ See also the variable `org-reverse-note-order'."
                     (delete-file (concat backup-file "~"))))
              (set-buffer-modified-p nil)
              (throw 'quit t)))
+          (reference-date org-remember-reference-date)
           (previousp (and (member current-prefix-arg '((16) 0))
                           org-remember-previous-location))
           (clockp (equal current-prefix-arg 2))
@@ -887,9 +896,9 @@ See also the variable `org-reverse-note-order'."
            ;; remove empty lines at end
            (replace-match "")))
       (goto-char (point-min))
+      (setq text-before-node-creation (buffer-string))
       (unless (looking-at org-outline-regexp)
        ;; add a headline
-       (setq text-before-node-creation (buffer-string))
        (insert (concat "* " (current-time-string)
                        " (" (remember-buffer-desc) ")\n"))
        (backward-char 1)
@@ -947,6 +956,10 @@ See also the variable `org-reverse-note-order'."
                (goto-char (point-max))
                (or (bolp) (newline))
                (setq org-goto-start-pos (point)))
+              ((eq heading 'date-tree)
+               (org-datetree-find-date-create reference-date)
+               (setq reversed nil)
+               (setq org-goto-start-pos (point)))
               ((and (stringp heading) (string-match "\\S-" heading))
                (goto-char (point-min))
                (if (re-search-forward