From mboxrd@z Thu Jan 1 00:00:00 1970 From: James TD Smith Subject: [PATCH 2/2] org-repeat-re was no longer matching simple +2d type repeaters. Fix. Date: Wed, 21 Oct 2009 10:52:49 +0100 Message-ID: <1256118769-787-3-git-send-email-ahktenzero@mohorovi.cc> References: <1256118769-787-1-git-send-email-ahktenzero@mohorovi.cc> <1256118769-787-2-git-send-email-ahktenzero@mohorovi.cc> Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0XsL-0005ZP-1q for emacs-orgmode@gnu.org; Wed, 21 Oct 2009 05:53:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N0XsF-0005VG-KR for emacs-orgmode@gnu.org; Wed, 21 Oct 2009 05:53:00 -0400 Received: from [199.232.76.173] (port=44253 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0XsF-0005Ut-8l for emacs-orgmode@gnu.org; Wed, 21 Oct 2009 05:52:55 -0400 Received: from 81-86-40-42.dsl.pipex.com ([81.86.40.42]:51778 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 1N0XsE-0004gy-FX for emacs-orgmode@gnu.org; Wed, 21 Oct 2009 05:52:55 -0400 In-Reply-To: <1256118769-787-2-git-send-email-ahktenzero@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 --- lisp/ChangeLog | 3 +++ lisp/org.el | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 75bdc38..9bd532d 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -39,6 +39,9 @@ 2009-10-21 James TD Smith + * org.el (org-repeat-re): The changed org-repeat-re no longer + matched simple +2d type repeaters. Fix it so it does. + * org-clock.el (org-x11-idle-seconds): Add a method to get the X11 idle time using the xscreensaver extension. (org-user-idle-seconds): Use X11 idle time if available. diff --git a/lisp/org.el b/lisp/org.el index cdb8d25..d5a30ac 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -475,7 +475,7 @@ An entry can be toggled between QUOTE and normal with :type 'string) (defconst org-repeat-re - "<[0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9] [^>\n]*?\\([.+]?\\+[0-9]+[dwmy]\\(/[0-9]+[dwmy]\\)?\\)" + "<[0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9] [^+.>\n]*\\([.+]?\\+[0-9]+[dwmy]\\(/[0-9]+[dwmy]\\)?\\)" "Regular expression for specifying repeated events. After a match, group 1 contains the repeat expression.") -- 1.6.3.3