From: "Sébastien Miquel" <sebastien.miquel@posteo.eu>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: emacs-orgmode@gnu.org
Subject: Re: [BUG] Source block indentation does not work properly for yaml-mode [9.6.6 ( @ /home/user/.emacs.d/elpa/org-9.6.6/)]
Date: Mon, 3 Jul 2023 12:49:17 +0000 [thread overview]
Message-ID: <8d6dd95e-5bce-44c3-638a-52351b69cc66@posteo.eu> (raw)
In-Reply-To: <874jml8ggm.fsf@localhost>
Ihor Radchenko writes:
>> What happens is: in the org buffer, the line is not empty, because it
>> has the org indentation (which was possibly just added by
>> org-indent-line), but in the edit buffer, the line is empty, because
>> the common org indentation was removed. In that case, we want to add
>> back the org indentation.
>
> May you please provide an example when it is necessary?
> `org-indent-line' will run `org-babel-do-key-sequence-in-edit-buffer', so
> it should still use `org-src--contents-for-write-back' and will not
> modify the org buffer text directly.
You're at the end of a line, you press =org-return-and-indent=.
1. It adds a newline character.
2. =org-indent-line= adds the org indentation, _before_ calling
=org-babel-do-key-sequence-in-edit-buffer=
3. The native edit call removes the common indentation, before
calling tab in the native buffer.
4. Calling tab in the native buffer possibly does nothing.
5. =org-src--contents-for-write-back= sees the current line is empty,
but it should indent it (with org indentation) nonetheless.
>> --- a/lisp/org-macs.el
>> +++ b/lisp/org-macs.el
>> @@ -483,9 +483,12 @@ line. Return nil if it fails."
>> (when skip-fl (forward-line))
>> (while (not (eobp))
>> (let ((ind (progn (skip-chars-forward " \t") (current-column))))
>> - (cond ((eolp) (delete-region (line-beginning-position) (point)))
>> - ((< ind n) (throw :exit nil))
>> - (t (indent-line-to (- ind n))))
>> + (cond ((< ind n)
>> + (if (eolp) (delete-region (line-beginning-position) (point))
>> + (throw :exit nil)))
>
> This function is actually confusing both before and after the change.
> According to the docstring:
>
> When optional argument N is a positive integer, remove exactly
> that much characters from indentation, if possible.
>
> But the function can actually remove less than N characters.
>
> Before your change, all the blank non-empty lines were unconditionally
> removed. After your change, the first such line is removed and the
> function returns nil without continuing.
I don't understand. With this change, the function only stops if it
finds a non blank line with less than n indentation (same as before).
When a blank line with less than n indentation is found, it is emptied
(same as before), and execution continues.
>> * lisp/org-macs.el (org-do-remove-indentation): Preserve
>> indentation (spaces vs tabs) past the common indentation to remove.
>> Do not empty blank lines.
>
> Since not removing blank lines is intentional after the change, why
> doing it on a single line that is indented less than N?
Are you advocating for computing N using blank lines as well ?
1. It isn't consistent with the previous behaviour.
2. If I mistakenly add a space to an empty line in a src block, an
edit-special round trip will add indentation to every line.
Is there any benefit ?
--
Sébastien Miquel
next prev parent reply other threads:[~2023-07-03 12:50 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-11 22:33 [BUG] Source block indentation does not work properly for yaml-mode [9.6.6 ( @ /home/user/.emacs.d/elpa/org-9.6.6/)] wolf
2023-06-14 12:16 ` Ihor Radchenko
2023-06-17 19:11 ` Sébastien Miquel
2023-06-18 11:16 ` Ihor Radchenko
2023-06-19 8:43 ` Sébastien Miquel
2023-06-19 11:05 ` Ihor Radchenko
2023-06-19 15:32 ` Sébastien Miquel
2023-06-20 10:02 ` Ihor Radchenko
2023-06-21 5:46 ` Sébastien Miquel
2023-06-25 10:46 ` Ihor Radchenko
2023-06-26 11:14 ` Sébastien Miquel
2023-06-26 11:45 ` Sébastien Miquel
2023-06-26 11:52 ` Ihor Radchenko
2023-06-26 12:15 ` Sébastien Miquel
2023-06-26 12:44 ` Ihor Radchenko
2023-06-27 8:54 ` Sébastien Miquel
2023-06-28 9:21 ` Ihor Radchenko
2023-06-29 15:54 ` Sébastien Miquel
2023-06-30 11:43 ` Ihor Radchenko
2023-06-30 20:27 ` Sébastien Miquel
2023-07-01 11:07 ` Ihor Radchenko
2023-07-01 17:17 ` Sébastien Miquel
2023-07-03 9:58 ` Ihor Radchenko
2023-07-03 12:49 ` Sébastien Miquel [this message]
2023-07-03 13:05 ` Ihor Radchenko
2023-07-03 13:48 ` Sébastien Miquel
2023-07-04 10:41 ` Ihor Radchenko
2023-07-06 11:01 ` Sébastien Miquel
2023-07-07 9:26 ` Ihor Radchenko
2023-07-07 9:54 ` Ihor Radchenko
2023-07-07 13:21 ` Sébastien Miquel
2023-07-08 8:44 ` Ihor Radchenko
2023-07-09 11:10 ` Sébastien Miquel
2023-07-10 8:22 ` Ihor Radchenko
2023-07-07 9:31 ` [BUG] org-list-struct-apply-struct overrides src block indentation (was: [BUG] Source block indentation does not work properly for yaml-mode [9.6.6 ( @ /home/user/.emacs.d/elpa/org-9.6.6/)]) Ihor Radchenko
2023-07-07 13:43 ` Sébastien Miquel
2023-07-08 9:06 ` Ihor Radchenko
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=8d6dd95e-5bce-44c3-638a-52351b69cc66@posteo.eu \
--to=sebastien.miquel@posteo.eu \
--cc=emacs-orgmode@gnu.org \
--cc=yantar92@posteo.net \
/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).