Browse Source

New option `org-log-state-notes-insert-after-drawers'.

Default is nil.
Carsten Dominik 16 years ago
parent
commit
a1d3086419
3 changed files with 23 additions and 3 deletions
  1. 4 0
      ORGWEBPAGE/Changes.org
  2. 6 0
      lisp/ChangeLog
  3. 13 3
      lisp/org.el

+ 4 - 0
ORGWEBPAGE/Changes.org

@@ -18,6 +18,10 @@
 
 
 ** Details
 ** Details
 
 
+*** New option `org-log-state-notes-insert-after-drawers'
+    Set this to t if you want state change notes to be inserted
+    after any drawers.
+
 *** New commands for export to PDF
 *** New commands for export to PDF
     This is using LaTeX export, and then processes it to PDF
     This is using LaTeX export, and then processes it to PDF
     using pdflatex.
     using pdflatex.

+ 6 - 0
lisp/ChangeLog

@@ -1,3 +1,9 @@
+2008-10-16  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.el (org-add-log-setup): Respect
+	`org-log-state-notes-insert-after-drawers'.
+	(org-log-state-notes-insert-after-drawers): New option.
+
 2008-10-15  Carsten Dominik  <dominik@science.uva.nl>
 2008-10-15  Carsten Dominik  <dominik@science.uva.nl>
 
 
 	* org-publish.el (org-publish-org-to): Handle case when
 	* org-publish.el (org-publish-org-to): Handle case when

+ 13 - 3
lisp/org.el

@@ -1492,6 +1492,14 @@ empty string.
 (unless (assq 'note org-log-note-headings)
 (unless (assq 'note org-log-note-headings)
   (push '(note . "%t") org-log-note-headings))
   (push '(note . "%t") org-log-note-headings))
 
 
+(defcustom org-log-state-notes-insert-after-drawers nil
+  "Non-nil means, insert state change notes after any drawers in entry.
+When nil, insert them right after the heading and perhaps the line
+with deadline/scheduling if present."
+  :group 'org-todo
+  :group 'org-progress
+  :type 'boolean)
+
 (defcustom org-log-states-order-reversed t
 (defcustom org-log-states-order-reversed t
   "Non-nil means, the latest state change note will be directly after heading.
   "Non-nil means, the latest state change note will be directly after heading.
 When nil, the notes will be orderer according to time."
 When nil, the notes will be orderer according to time."
@@ -8347,9 +8355,11 @@ EXTRA is additional text that will be inserted into the notes buffer."
 	(org-back-to-heading t)
 	(org-back-to-heading t)
 	(narrow-to-region (point) (save-excursion 
 	(narrow-to-region (point) (save-excursion 
 				    (outline-next-heading) (point)))
 				    (outline-next-heading) (point)))
-	(while (re-search-forward
-		(concat "\\(" org-drawer-regexp "\\|" org-property-end-re "\\)")
-		(point-max) t) (forward-line))
+	(when org-log-state-notes-insert-after-drawers
+	  (while (re-search-forward
+		  (concat "\\(" org-drawer-regexp
+			  "\\|" org-property-end-re "\\)")
+		  (point-max) t) (forward-line)))
 	(looking-at (concat outline-regexp "\\( *\\)[^\r\n]*"
 	(looking-at (concat outline-regexp "\\( *\\)[^\r\n]*"
 			    "\\(\n[^\r\n]*?" org-keyword-time-not-clock-regexp
 			    "\\(\n[^\r\n]*?" org-keyword-time-not-clock-regexp
 			    "[^\r\n]*\\)?"))
 			    "[^\r\n]*\\)?"))