From mboxrd@z Thu Jan 1 00:00:00 1970 From: James TD Smith Subject: [PATCH 5/7] Fix note insertion in entries with drawers. Date: Fri, 25 Jul 2008 00:46:29 +0100 Message-ID: <20080724234629.23478.41349.stgit@nyarlathotep.internal.mohorovi.cc> References: <20080724234608.23478.48564.stgit@nyarlathotep.internal.mohorovi.cc> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KMAW6-0003d1-9C for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KMAW4-0003bG-36 for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:37 -0400 Received: from [199.232.76.173] (port=33543 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KMAW3-0003aO-RN for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:35 -0400 Received: from 81-86-40-42.dsl.pipex.com ([81.86.40.42]:58319 helo=yog-sothoth.mohorovi.cc) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KMAW1-0005sT-Qf for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:34 -0400 Received: from nyarlathotep.internal.mohorovi.cc (Debian-exim@nyarlathotep.internal.mohorovi.cc [10.0.0.5]) by yog-sothoth.mohorovi.cc (8.13.4/8.13.4) with ESMTP id m6ONlUJo002363 for ; Fri, 25 Jul 2008 00:47:30 +0100 (BST) (envelope-from ahktenzero@mohorovi.cc) Received: from [127.0.0.1] (helo=nyarlathotep.internal.mohorovi.cc ident=ahktenzero) by nyarlathotep.internal.mohorovi.cc with esmtp (Exim 4.69) (envelope-from ) id 1KMAVx-00069S-9D for emacs-orgmode@gnu.org; Fri, 25 Jul 2008 00:46:29 +0100 In-Reply-To: <20080724234608.23478.48564.stgit@nyarlathotep.internal.mohorovi.cc> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org The code to find the insertion point after a heading for notes was not skipping over drawers, resulting in notes being added inbetween the scheduling keywords and the first drawer. Notes are now inserted after any drawers in an item. --- lisp/ChangeLog | 2 ++ lisp/org.el | 43 ++++++++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ea6e60e..d072d40 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,8 @@ * org.el (org-get-refile-targets): Replace links with their descriptions (org-imenu-get-tree): Replace links with their descriptions + (org-add-log-setup): Skip over drawers (properties, clocks etc) + when adding notes. * org-agenda.el (org-agenda-get-closed): show durations of clocked items as well as the start and end times. diff --git a/lisp/org.el b/lisp/org.el index cbce370..97e0d03 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8444,10 +8444,10 @@ For calling through lisp, arg is also interpreted in the following way: ;; It is now done, and it was not done before (org-add-planning-info 'closed (org-current-time)) (if (and (not dolog) (eq 'note org-log-done)) - (org-add-log-setup 'done state 'findpos 'note))) + (org-add-log-setup 'done state t 'note))) (when (and state dolog) ;; This is a non-nil state, and we need to log it - (org-add-log-setup 'state state 'findpos dolog))) + (org-add-log-setup 'state state t dolog))) ;; Fixup tag positioning (and org-auto-align-tags (not org-setting-tags) (org-set-tags nil t)) (when org-provide-todo-statistics @@ -8681,7 +8681,7 @@ This function is run automatically after each state change to a DONE state." (setq org-log-note-how 'note)) ;; Set up for taking a record (org-add-log-setup 'state (or done-word (car org-done-keywords)) - 'findpos org-log-repeat))) + t org-log-repeat))) (org-back-to-heading t) (org-add-planning-info nil nil 'closed) (setq re (concat "\\(" org-scheduled-time-regexp "\\)\\|\\(" @@ -8908,22 +8908,27 @@ This is done in the same way as adding a state change note." If this is about to TODO state change, the new state is expected in STATE. When FINDPOS is non-nil, find the correct position for the note in the current entry. If not, assume that it can be inserted at point." - (save-excursion - (when findpos - (org-back-to-heading t) - (looking-at (concat outline-regexp "\\( *\\)[^\r\n]*" - "\\(\n[^\r\n]*?" org-keyword-time-not-clock-regexp - "[^\r\n]*\\)?")) - (goto-char (match-end 0)) - (unless org-log-states-order-reversed - (and (= (char-after) ?\n) (forward-char 1)) - (org-skip-over-state-notes) - (skip-chars-backward " \t\n\r"))) - (move-marker org-log-note-marker (point)) - (setq org-log-note-purpose purpose - org-log-note-state state - org-log-note-how how) - (add-hook 'post-command-hook 'org-add-log-note 'append))) + (save-restriction + (save-excursion + (when findpos + (org-back-to-heading t) + (org-narrow-to-subtree) + (looking-at (concat outline-regexp "\\( *\\)[^\r\n]*" + "\\(\n[^\r\n]*?" org-keyword-time-not-clock-regexp + "[^\r\n]*\\)?")) + (goto-char (match-end 0)) + (while (re-search-forward + (concat "\\(" org-drawer-regexp "\\|" org-property-end-re "\\)") + (point-max) t)) + (unless org-log-states-order-reversed + (and (= (char-after) ?\n) (forward-char 1)) + (org-skip-over-state-notes) + (skip-chars-backward " \t\n\r"))) + (move-marker org-log-note-marker (point)) + (setq org-log-note-purpose purpose + org-log-note-state state + org-log-note-how how) + (add-hook 'post-command-hook 'org-add-log-note 'append)))) (defun org-skip-over-state-notes () "Skip past the list of State notes in an entry."