From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: Re: checkbox statistics (fixed version) Date: Sun, 10 May 2009 09:17:26 +0200 Message-ID: References: <87iqky8erm.fsf@gmail.com> <6B91D94A-35ED-493C-B11F-538EE0F78EFF@gmail.com> <8763gu8atv.fsf_-_@gmail.com> Mime-Version: 1.0 (Apple Message framework v930.3) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M33I6-0005oh-No for emacs-orgmode@gnu.org; Sun, 10 May 2009 03:17:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M33I2-0005oN-Ve for emacs-orgmode@gnu.org; Sun, 10 May 2009 03:17:42 -0400 Received: from [199.232.76.173] (port=44137 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M33I2-0005oE-PS for emacs-orgmode@gnu.org; Sun, 10 May 2009 03:17:38 -0400 Received: from mx20.gnu.org ([199.232.41.8]:13777) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M33I2-0001D1-85 for emacs-orgmode@gnu.org; Sun, 10 May 2009 03:17:38 -0400 Received: from mail-ew0-f162.google.com ([209.85.219.162]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M33I1-00012W-Kx for emacs-orgmode@gnu.org; Sun, 10 May 2009 03:17:37 -0400 Received: by ewy6 with SMTP id 6so2902578ewy.42 for ; Sun, 10 May 2009 00:17:36 -0700 (PDT) In-Reply-To: <8763gu8atv.fsf_-_@gmail.com> 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: Richard KLINDA Cc: emacs-orgmode@gnu.org Hi Richard, I am accepting the patch, with one small change: The new variable is called `org-hierarchical-checkbox-statistics' and works the other way round, default t. Thanks. - Carsten On Apr 24, 2009, at 3:01 PM, Richard KLINDA wrote: > This is the fixed patch, it actually works on my real life org files > so > this has a slight chance of being right. > >> ------------------------------------------------------------------------ > > diff --git a/lisp/org-list.el b/lisp/org-list.el > index 7469add..872dddf 100644 > --- a/lisp/org-list.el > +++ b/lisp/org-list.el > @@ -110,6 +110,9 @@ with \\[org-ctrl-c-ctrl-c\\]." > :group 'org-plain-lists > :type 'boolean) > > +(defcustom org-recursive-checkbox-statistics nil > + "Non-nil means, that checkbox counting should happen recursively.") > + > (defcustom org-description-max-indent 20 > "Maximum indentation for the second line of a description list. > When the indentation would be larger than this, it will become > @@ -402,7 +405,10 @@ the whole buffer." > (org-beginning-of-item) > (setq curr-ind (org-get-indentation)) > (setq next-ind curr-ind) > - (while (and (bolp) (org-at-item-p) (= curr-ind next- > ind)) > + (while (and (bolp) (org-at-item-p) > + (if org-recursive-checkbox-statistics > + (<= curr-ind next-ind) > + (= curr-ind next-ind))) > (save-excursion (end-of-line) (setq eline (point))) > (if (re-search-forward re-box eline t) > (if (member (match-string 2) '("[ ]" "[-]")) > @@ -410,7 +416,12 @@ the whole buffer." > (setq c-on (1+ c-on)) > ) > ) > - (org-end-of-item) > + (if org-recursive-checkbox-statistics > + (progn > + (end-of-line) > + (when (re-search-forward org-list-beginning- > re lim t) > + (beginning-of-line))) > + (org-end-of-item)) > (setq next-ind (org-get-indentation)) > ))) > (goto-char continue-from) > >> ------------------------------------------------------------------------ > > -- > Richard > > > _______________________________________________ > Emacs-orgmode mailing list > Remember: use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode