emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Jonas Hörsch" <coroa@online.de>
To: Nicolas Goaziou <n.goaziou@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] hide inline-tasks in 'children visibility state
Date: Mon, 04 Nov 2013 09:52:53 +0100	[thread overview]
Message-ID: <87txfsczve.fsf@kafka.loc> (raw)
In-Reply-To: <87li19agx5.fsf@gmail.com>


[-- Attachment #1.1: Type: text/plain, Size: 961 bytes --]

Hi,


On Thu, Oct 31 2013, Nicolas Goaziou wrote:

> coroa@online.de (Jonas Hörsch) writes:
>>
>> +  (cond ((eq state 'contents)
>
> I suggest to use `case' here, but it's really a matter of style.

fine with me. i wasn't sure about the usage convention for cl. i
switched to the namespaced cl-case variant, for now.

>> +	   (hide-sublevels (1- org-inlinetask-min-level))))
>> +	     (while (and (outline-next-heading)
>> +			 (org-inlinetask-at-task-p))
>
> I think it is more efficient to directly look for inlinetasks since you
> can use `org-inlinetask-outline-regexp'.

hmm ... i'm not so sure. as you can see in the attached patch, now i
have to perform an extra search on each headline to find the boundary
for the inline task search. it feels to me like this would be faster for
a situation with more than one inline task per headline in the mean?
(which i don't think is the likely situation).

well, what do you think?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-org-inlinetask-Hide-inline-tasks-in-children-visibil.patch --]
[-- Type: text/x-patch, Size: 1708 bytes --]

From 763f4d8c8daa0c09809a677c8cd8358476336f24 Mon Sep 17 00:00:00 2001
From: Jonas Hoersch <coroa@online.de>
Date: Wed, 30 Oct 2013 15:39:33 +0100
Subject: [PATCH] org-inlinetask: Hide inline tasks in 'children visibility
 state

* lisp/org.el (org-cycle-hide-inline-tasks): Re-hide inline tasks when
  switching to 'children visibility state.

TINYCHANGE
---
 lisp/org.el | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 4f3bf4b..c94e2ee 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7074,11 +7074,23 @@ open and agenda-wise Org files."
 	  (org-flag-drawer t))))))
 
 (defun org-cycle-hide-inline-tasks (state)
-  "Re-hide inline task when switching to 'contents visibility state."
-  (when (and (eq state 'contents)
-	     (boundp 'org-inlinetask-min-level)
-	     org-inlinetask-min-level)
-    (hide-sublevels (1- org-inlinetask-min-level))))
+  "Re-hide inline tasks when switching to 'contents or 'children
+visibility state."
+  (cl-case state
+    (contents
+     (when (org-bound-and-true-p org-inlinetask-min-level)
+       (hide-sublevels (1- org-inlinetask-min-level))))
+    (children
+     (when (featurep 'org-inlinetask)
+       (let ((end (save-excursion
+		    (if (re-search-forward
+			 (concat "[\r\n]\\(" org-outline-regexp "\\)") nil t)
+			(match-beginning 1)
+		      (point-max)))))
+	 (save-excursion
+	   (while (re-search-forward (org-inlinetask-outline-regexp) end t)
+	     (org-inlinetask-toggle-visibility)
+	     (org-inlinetask-goto-end))))))))
 
 (defun org-flag-drawer (flag)
   "When FLAG is non-nil, hide the drawer we are within.
-- 
1.8.4


[-- Attachment #1.3: Type: text/plain, Size: 123 bytes --]


p.s.: for some weird reason, i was convinced i submitted this mail a
few days ago ... but my mail program says otherwise.

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

  reply	other threads:[~2013-11-04  8:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-30 15:38 [PATCH] hide inline-tasks in 'children visibility state Jonas Hörsch
2013-10-31 10:11 ` Nicolas Goaziou
2013-11-04  8:52   ` Jonas Hörsch [this message]
2013-11-05 21:29     ` Nicolas Goaziou

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87txfsczve.fsf@kafka.loc \
    --to=coroa@online.de \
    --cc=emacs-orgmode@gnu.org \
    --cc=n.goaziou@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).