[PATCH] fix org-indent-mode for org-indent-indentation-per-level != 2

[PATCH] fix org-indent-mode for org-indent-indentation-per-level != 2

[Ingo Lohmar]

Dear All,

After two years with explicit whitespace indentation, I am now a happy
user of org-indent-mode.  But I like org-indent-indentation-per-level
set to 1 (instead of 2), which rendered the indented parts not aligned
with their heading.

In the old thread http://thread.gmane.org/gmane.emacs.orgmode/26169 a
fix for org-indent-add-properties was described, but the thread died
with the implication that this is not a bug, but a matter of style.  I
disagree: the sole purpose of using org-indent-mode is to have the body
text align (no ambiguity here IMO) with its heading.

Below is an updated patch that works with the 7.7 release (sorry for not
using the development version right now).  I have been using this for
weeks without any issues.  As discussed in the above thread, the
calculated indentation is negative before the first heading, but the
function is never actually used there.

Best,
Ingo



--- org-indent.el	2011-12-10 13:18:16.920914213 +0200
+++ org-indent.el	2011-12-10 13:27:42.660937366 +0200
@@ -255,15 +255,15 @@
 		   (aref org-indent-stars nstars)
 		   'wrap-prefix
 		   (aref org-indent-strings
-			 (* (funcall get-real-level e level)
-			    org-indent-indentation-per-level)))))
+       (+ 2 (* (1- (funcall get-real-level e level))
+          org-indent-indentation-per-level))))))
 	  (when (> e b)
 	    (add-text-properties
 	     b  e (list 'line-prefix (aref org-indent-strings n)
 			'wrap-prefix (aref org-indent-strings n))))
 	  (setq b (1+ (point-at-eol))
-		n (* (funcall get-real-level b level)
-		     org-indent-indentation-per-level)))))))
+		n (+ 2 (* (1- (funcall get-real-level b level))
+              org-indent-indentation-per-level))))))))
 
 (defvar org-inlinetask-min-level)
 (defun org-indent-refresh-section ()

Re: [PATCH] fix org-indent-mode for org-indent-indentation-per-level != 2

[Nicolas Goaziou]

Hello,

Ingo Lohmar <i.lohmar@gmail.com> writes:

> Below is an updated patch that works with the 7.7 release (sorry for not
> using the development version right now).

org-indent.el has been heavily modified since 7.7 release. You may want
to test development version first, as your patch might not be necessary
anymore.


Regards,

-- 
Nicolas Goaziou

Re: [PATCH] fix org-indent-mode for org-indent-indentation-per-level != 2

[Bastien]

Hi,

Nicolas Goaziou <n.goaziou@gmail.com> writes:

> Ingo Lohmar <i.lohmar@gmail.com> writes:
>
>> Below is an updated patch that works with the 7.7 release (sorry for not
>> using the development version right now).
>
> org-indent.el has been heavily modified since 7.7 release. You may want
> to test development version first, as your patch might not be necessary
> anymore.

I did try to apply the patch and it failed.  

Ingo, please try the latest org-indent.el version.  

Best,

-- 
 Bastien

Re: [PATCH] fix org-indent-mode for org-indent-indentation-per-level != 2

[Ingo Lohmar]

On Sun, 11 Dec 2011 09:57:50 +0100, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
> Hello,
> 
> Ingo Lohmar <i.lohmar@gmail.com> writes:
> 
> > Below is an updated patch that works with the 7.7 release (sorry for not
> > using the development version right now).
> 
> org-indent.el has been heavily modified since 7.7 release. You may want
> to test development version first, as your patch might not be necessary
> anymore.

Hi Nicolas,

My bad, and bad timing: Should have checked the development status.
Turns out, it is very different now, but unfortunately still wrong.  I
will check how to fix it and come back (hopefully) with a new patch.

Regards,
Ingo

Re: [PATCH] fix org-indent-mode for org-indent-indentation-per-level != 2

[Nicolas Goaziou]

Ingo Lohmar <i.lohmar@gmail.com> writes:

> My bad, and bad timing: Should have checked the development status.
> Turns out, it is very different now, but unfortunately still wrong.

Unless I'm missing your point, I don't see anything wrong in the current
behaviour. Whatever may be the value of
`org-indent-indentation-per-level', the text is always aligned with the
headline.


Regards,

-- 
Nicolas Goaziou

Re: [PATCH] fix org-indent-mode for org-indent-indentation-per-level != 2

[Ingo Lohmar]

On Sun, 11 Dec 2011 14:04:38 +0100, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
> Ingo Lohmar <i.lohmar@gmail.com> writes:
> 
> > My bad, and bad timing: Should have checked the development status.
> > Turns out, it is very different now, but unfortunately still wrong.
> 
> Unless I'm missing your point, I don't see anything wrong in the current
> behaviour. Whatever may be the value of
> `org-indent-indentation-per-level', the text is always aligned with the
> headline.

Hmmm, just did a clean test:  emacs -Q, require org-install and org-indent.

If I use the std setting of 2 and turn on org-indent-mode, all is fine:

* 1st-level heading
  Here goes the text.
*** 2nd-level heading
    More text.

Setting the indentation to 1:
   
* 1st-level heading
 Here goes the text.
** 2nd-level heading
  More text.

That is, missing one space.  Will check again.
  

Re: [PATCH] fix org-indent-mode for org-indent-indentation-per-level != 2

[Nicolas Goaziou]

Ingo Lohmar <i.lohmar@gmail.com> writes:

> Hmmm, just did a clean test:  emacs -Q, require org-install and org-indent.
>
> If I use the std setting of 2 and turn on org-indent-mode, all is fine:
>
> * 1st-level heading
>   Here goes the text.
> *** 2nd-level heading
>     More text.
>
> Setting the indentation to 1:
>    
> * 1st-level heading
>  Here goes the text.
> ** 2nd-level heading
>   More text.

I cannot reproduce this. Could you try to byte-compile again all Org
files, or call org-reload with an argument?


Regards,

-- 
Nicolas Goaziou

Re: [PATCH] fix org-indent-mode for org-indent-indentation-per-level != 2

[Ingo Lohmar]

On Sun, 11 Dec 2011 14:25:11 +0100, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
> Ingo Lohmar <i.lohmar@gmail.com> writes:
> 
> > Hmmm, just did a clean test:  emacs -Q, require org-install and org-indent.
> >
> > If I use the std setting of 2 and turn on org-indent-mode, all is fine:
> >
> > * 1st-level heading
> >   Here goes the text.
> > *** 2nd-level heading
> >     More text.
> >
> > Setting the indentation to 1:
> >    
> > * 1st-level heading
> >  Here goes the text.
> > ** 2nd-level heading
> >   More text.
> 
> I cannot reproduce this. Could you try to byte-compile again all Org
> files, or call org-reload with an argument?

Guys,

I am terribly sorry --- my apologies for the noise.  I had an issue with
shadowed load paths.  From what I can see, org-indent works just fine in
the development version.

Learned one or two things :)

Regards,
Ingo

Re: [PATCH] fix org-indent-mode for org-indent-indentation-per-level != 2

[Bastien]

Ingo Lohmar <i.lohmar@gmail.com> writes:

> I am terribly sorry --- my apologies for the noise.  I had an issue with
> shadowed load paths.  From what I can see, org-indent works just fine in
> the development version.

That's good news :)  Thanks for confirming,

-- 
 Bastien