From mboxrd@z Thu Jan 1 00:00:00 1970 From: Toby Cubitt Subject: [PATCH] Fix bug in org-agenda-diary-sexp-prefix Date: Fri, 26 Oct 2012 14:27:59 +0200 Message-ID: <20121026122759.GA9074@c3po> Reply-To: Toby Cubitt Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="azLHFNyN32YCQGCU" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:42060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRj11-00060U-H2 for emacs-orgmode@gnu.org; Fri, 26 Oct 2012 08:28:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRj0x-0002Po-BK for emacs-orgmode@gnu.org; Fri, 26 Oct 2012 08:27:55 -0400 Received: from starfish.geekisp.com ([216.168.135.166]:45502) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1TRj0x-0002Pa-4L for emacs-orgmode@gnu.org; Fri, 26 Oct 2012 08:27:51 -0400 Content-Disposition: inline List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode --azLHFNyN32YCQGCU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The commit message in the attached patch explains the problem, and the simple fix. Toby -- Dr T. S. Cubitt Mathematics and Quantum Information group Department of Mathematics Complutense University Madrid, Spain email: tsc25@cantab.net web: www.dr-qubit.org --azLHFNyN32YCQGCU Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="0001-Fix-bug-in-org-agenda-diary-sexp-prefix.patch" >From b777c7ca29c74476893dd62599c344c0ff5998e6 Mon Sep 17 00:00:00 2001 From: "Toby S. Cubitt" Date: Fri, 26 Oct 2012 14:06:28 +0200 Subject: [PATCH] Fix bug in org-agenda-diary-sexp-prefix * lisp/org-agenda.el (org-agenda-get-sexps): reset `extra' to nil at beginning of re-search-forward loop, otherwise next iteration picks up `extra' value from previous entry. --- lisp/org-agenda.el | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index b9588bb..a2ed3b6 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5482,7 +5482,8 @@ Do we have a reason to ignore this TODO entry because it has a time stamp? tags (save-excursion (org-backward-heading-same-level 0) (org-get-tags-at)) todo-state (org-get-todo-state) - warntime (org-entry-get (point) "APPT_WARNTIME")) + warntime (org-entry-get (point) "APPT_WARNTIME") + extra nil) (dolist (r (if (stringp result) (list result) -- 1.7.8.6 --azLHFNyN32YCQGCU--