Re: [O] BUG: Wrong indentation inside src block

2016-04-20 Thread Nicolas Goaziou
fm4d  writes:

> Yes, well, I did not dig deeper into the 'maint' branch to find the
> exact commit that caused it and since I managed to fix it and nobody
> else is able to reproduce the issue I dont think I will.

I understand. OTOH, if you find the energy to dig deeper, it may help us
understanding what makes the issue visible in your situation only.

Regards,



Re: [O] BUG: Wrong indentation inside src block

2016-04-20 Thread fm4d



Nicolas Goaziou writes:

> Hello,
>
> fm4d  writes:
>
>> I believe that this diff is part of that commit -
>> http://repo.or.cz/org-mode.git/blobdiff/1045e9e9c0e6438f5ee9dc4f0e5c720a8b670cdd..a311a856514e9245074b02c89d51a9f339784d1c:/lisp/org.el
>
> The commit you point to is a branch merge. It is a kind of "meta commit"
> that incorporates changes made in a set of previous commits. I think
> your culprit happened earlier.
>
> Regards,

Yes, well, I did not dig deeper into the 'maint' branch to find the
exact commit that caused it and since I managed to fix it and nobody
else is able to reproduce the issue I dont think I will.




Re: [O] BUG: Wrong indentation inside src block

2016-04-20 Thread Nicolas Goaziou
Hello,

fm4d  writes:

> I believe that this diff is part of that commit -
> http://repo.or.cz/org-mode.git/blobdiff/1045e9e9c0e6438f5ee9dc4f0e5c720a8b670cdd..a311a856514e9245074b02c89d51a9f339784d1c:/lisp/org.el

The commit you point to is a branch merge. It is a kind of "meta commit"
that incorporates changes made in a set of previous commits. I think
your culprit happened earlier.

Regards,

-- 
Nicolas Goaziou



Re: [O] BUG: Wrong indentation inside src block

2016-04-20 Thread fm4d

I believe that this diff is part of that commit -
http://repo.or.cz/org-mode.git/blobdiff/1045e9e9c0e6438f5ee9dc4f0e5c720a8b670cdd..a311a856514e9245074b02c89d51a9f339784d1c:/lisp/org.el

Nicolas Goaziou writes:

> Hello,
>
> fm4d  writes:
>
>> Well, the behaviour is IMO different because something happend in the
>> commit
>> http://repo.or.cz/org-mode.git/commit/a311a856514e9245074b02c89d51a9f339784d1c
>> that broke it. The indent-tabs-mode is off.
>
> Actually, that commit changes nothing. Could you double check your bisecting?
>
> Regards,


-- 
~~~ fm4d ~~~




Re: [O] BUG: Wrong indentation inside src block

2016-04-19 Thread Nicolas Goaziou
Hello,

fm4d  writes:

> Well, the behaviour is IMO different because something happend in the
> commit
> http://repo.or.cz/org-mode.git/commit/a311a856514e9245074b02c89d51a9f339784d1c
> that broke it. The indent-tabs-mode is off.

Actually, that commit changes nothing. Could you double check your bisecting?

Regards,

-- 
Nicolas Goaziou



Re: [O] BUG: Wrong indentation inside src block

2016-04-19 Thread fm4d
Well, the behaviour is IMO different because something happend in the
commit
http://repo.or.cz/org-mode.git/commit/a311a856514e9245074b02c89d51a9f339784d1c
that broke it. The indent-tabs-mode is off.
Eric S Fraga writes:

> On Saturday, 16 Apr 2016 at 15:42, fm4d wrote:
>> I made two short videos showing what exactly I mean.
>>
>> http://fm4d.net/indent1.ogv - with master
>> http://fm4d.net/indent2.ogv - with 8.3.3
>
> I don't understand why the behaviour is different with different
> versions of org but, just in case, what is the setting of
> indent-tabs-mode?  I find that things work best with this set to
> nil.  The actual use of tabs is a holdover from typewriter days...


-- 
~~~ fm4d ~~~




Re: [O] BUG: Wrong indentation inside src block

2016-04-16 Thread fm4d
Eric S Fraga  ucl.ac.uk> writes:

> 
> I don't understand why the behaviour is different with different
> versions of org but, just in case, what is the setting of
> indent-tabs-mode?  I find that things work best with this set to
> nil.  The actual use of tabs is a holdover from typewriter days...
> 

Well, you were right, (setq-default indent-tabs-mode nil) solved the
issue for me. Now I understand why nobody noticed it, but I still
find it weird that until the commit it worked for me even with
indent-tabs-mode on. Maybe it is worth some comment in
documentation because indent-tabs-mode is on by default.




Re: [O] BUG: Wrong indentation inside src block

2016-04-16 Thread Eric S Fraga
On Saturday, 16 Apr 2016 at 15:42, fm4d wrote:
> I made two short videos showing what exactly I mean.
>
> http://fm4d.net/indent1.ogv - with master
> http://fm4d.net/indent2.ogv - with 8.3.3

I don't understand why the behaviour is different with different
versions of org but, just in case, what is the setting of
indent-tabs-mode?  I find that things work best with this set to
nil.  The actual use of tabs is a holdover from typewriter days...

-- 
: Eric S Fraga (0xFFFCF67D), Emacs 25.0.92.1, Org release_8.3.4-705-g716e33



Re: [O] BUG: Wrong indentation inside src block

2016-04-16 Thread fm4d
John Hendy  gmail.com> writes:

> 
> 
> 
> On Apr 16, 2016 09:31, "Adam Porter"  alphapapa.net> wrote:
> >
> > The only thing I can think of is that it might be something to do with
> > indenting with tabs vs. spaces.  Maybe check your indentation settings.
> > Also see if you can reproduce it with emacs -q; if not, it's probably an
> > issue with your config.
> Not sure of it's the same, but I had some issues with spaces/tabs myself a
> bit back and agree it's a good place to look.
> - https://lists.gnu.org/archive/html/emacs-orgmode/2014-01/msg01505.html
> One can also check the mentioned variable, org-src-preserve-indentation.
> John
> >
> >
> 

I made two short videos showing what exactly I mean.

http://fm4d.net/indent1.ogv - with master
http://fm4d.net/indent2.ogv - with 8.3.3

There is no configuration, .emacs only has three lines with

>> (add-to-list 'load-path "~/Git/org-mode/lisp")
>> (require 'org)
>> (setq org-startup-indented t)



Re: [O] BUG: Wrong indentation inside src block

2016-04-16 Thread John Hendy
On Apr 16, 2016 09:31, "Adam Porter"  wrote:
>
> fm4d  writes:
>
> > I can see that I should have explain it with more clarity.
> > I am using  and the actual code is indented correctly inside
> >  and when tangled, BUT it is displayed incorrectly in the
> > src block after I return from  and org-indent-mode is on.
> > The code I posted should show what I mean, the expression inside
> > src block (pasted and indented correctly inside ) is just
> > incorrectly rendered outside of . Tracking it to this merge
> > commit was the best I could do, I was trying to look throught the
> > changes but with no luck.
>
> The only thing I can think of is that it might be something to do with
> indenting with tabs vs. spaces.  Maybe check your indentation settings.
> Also see if you can reproduce it with emacs -q; if not, it's probably an
> issue with your config.

Not sure of it's the same, but I had some issues with spaces/tabs myself a
bit back and agree it's a good place to look.
- https://lists.gnu.org/archive/html/emacs-orgmode/2014-01/msg01505.html

One can also check the mentioned variable, org-src-preserve-indentation.

John

>
>


Re: [O] BUG: Wrong indentation inside src block

2016-04-16 Thread Adam Porter
fm4d  writes:

> I can see that I should have explain it with more clarity.
> I am using  and the actual code is indented correctly inside
>  and when tangled, BUT it is displayed incorrectly in the
> src block after I return from  and org-indent-mode is on.
> The code I posted should show what I mean, the expression inside
> src block (pasted and indented correctly inside ) is just
> incorrectly rendered outside of . Tracking it to this merge
> commit was the best I could do, I was trying to look throught the
> changes but with no luck.

The only thing I can think of is that it might be something to do with
indenting with tabs vs. spaces.  Maybe check your indentation settings.
Also see if you can reproduce it with emacs -q; if not, it's probably an
issue with your config.




Re: [O] BUG: Wrong indentation inside src block

2016-04-16 Thread Nicolas Goaziou
Hello,

fm4d  writes:

> I can see that I should have explain it with more clarity.
> I am using  and the actual code is indented correctly inside
>  and when tangled, BUT it is displayed incorrectly in the
> src block after I return from  and org-indent-mode is on.
> The code I posted should show what I mean, the expression inside
> src block (pasted and indented correctly inside ) is just
> incorrectly rendered outside of . Tracking it to this merge
> commit was the best I could do, I was trying to look throught the
> changes but with no luck.

FWIW, I cannot reproduce it either.


Regards,

-- 
Nicolas Goaziou



Re: [O] BUG: Wrong indentation inside src block

2016-04-16 Thread fm4d
Adam Porter  writes:

> fm4d  writes:
>
>> Hello, I found an indentation bug in the master branch.
>>
>> Steps to reproduce: 
>>
>> * Test 1
>> ** Test 2
>> #+BEGIN_SRC emacs-lisp
>>   (setq foo 1
>> bar 2)
>> #+END_SRC
>>
>> Paste this code into org-mode buffer with org-startup-indented turn on
>> org-indented-mode. You should see the src block missindented like this:
>>
>>   (setq foo 1
>>  bar 2)
>>
>> I've tracked this bug to this commit
>> http://repo.or.cz/org-mode.git/commit/a311a856514e9245074b02c89d51a9f339784d1c
>
> Hm, I'm not sure I understand the problem.  Org doesn't automatically
> reindent source blocks, as far as I know.  You can  and reindent
> the source buffer, and then when you save it it will be reflected in the
> Org buffer.  I made a little function to do that as a command, which I
> could share if you like.
>
> Also, the examples you gave have mixed spaces and tabs, so it's hard to
> tell whether they're indented correctly.  For example, I see the second
> example indented correctly, while the first is not.  You might try
> turning on whitespace-mode, which makes it easy to see where they are.
>
> BTW, that commit is a large merge commit, so it's hard to see where the
> problem would be.  You could try bisecting it on the branch it was
> merged from.

I can see that I should have explain it with more clarity.
I am using  and the actual code is indented correctly inside
 and when tangled, BUT it is displayed incorrectly in the
src block after I return from  and org-indent-mode is on.
The code I posted should show what I mean, the expression inside
src block (pasted and indented correctly inside ) is just
incorrectly rendered outside of . Tracking it to this merge
commit was the best I could do, I was trying to look throught the
changes but with no luck.




Re: [O] BUG: Wrong indentation inside src block

2016-04-15 Thread Adam Porter
fm4d  writes:

> Hello, I found an indentation bug in the master branch.
>
> Steps to reproduce: 
>
> * Test 1
> ** Test 2
> #+BEGIN_SRC emacs-lisp
>   (setq foo 1
>  bar 2)
> #+END_SRC
>
> Paste this code into org-mode buffer with org-startup-indented turn on
> org-indented-mode. You should see the src block missindented like this:
>
>   (setq foo 1
>   bar 2)
>
> I've tracked this bug to this commit
> http://repo.or.cz/org-mode.git/commit/a311a856514e9245074b02c89d51a9f339784d1c

Hm, I'm not sure I understand the problem.  Org doesn't automatically
reindent source blocks, as far as I know.  You can  and reindent
the source buffer, and then when you save it it will be reflected in the
Org buffer.  I made a little function to do that as a command, which I
could share if you like.

Also, the examples you gave have mixed spaces and tabs, so it's hard to
tell whether they're indented correctly.  For example, I see the second
example indented correctly, while the first is not.  You might try
turning on whitespace-mode, which makes it easy to see where they are.

BTW, that commit is a large merge commit, so it's hard to see where the
problem would be.  You could try bisecting it on the branch it was
merged from.




[O] BUG: Wrong indentation inside src block

2016-04-15 Thread fm4d
Hello, I found an indentation bug in the master branch.

Steps to reproduce: 

* Test 1
** Test 2
#+BEGIN_SRC emacs-lisp
  (setq foo 1
   bar 2)
#+END_SRC

Paste this code into org-mode buffer with org-startup-indented turn on
org-indented-mode. You should see the src block missindented like this:

  (setq foo 1
bar 2)

I've tracked this bug to this commit
http://repo.or.cz/org-mode.git/commit/a311a856514e9245074b02c89d51a9f339784d1c