From: Sebastian Miele <sebastian.miele@gmail.com>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Respect buffer-local value of `org-edit-src-content-indentation'
Date: Wed, 20 Nov 2019 06:12:46 +0000 [thread overview]
Message-ID: <874kyznkip.fsf@gmail.com> (raw)
In-Reply-To: <871ru49mlt.fsf@nicolasgoaziou.fr>
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
Hi Nicolas,
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> Sebastian Miele <sebastian.miele@gmail.com> writes:
>
>> The Org default of org-edit-src-content-indentation is 2. I like that
>> value and leave it that way. Worg's root .dir-locals sets it to 0
>> buffer-locally in at least many Worg's Org files. Hence, when I edit an
>> src block in a Worg file, the value of org-edit-src-content-indentation
>> in the edit buffer is 2. But the correct value in that case is 0.
>
> Then I think we should do the same as what is done for, e.g.,
> `org-src--preserve-indentation`, i.e. store the initial value from
> `org-src--edit-element', and use it in
> `org-src--contents-for-write-back'.
>
> WDYT?
That's perfectly fine with me. An updated patch is attached.
Best wishes
Sebastian
[-- Attachment #2: 0001-Respect-buffer-local-value-of-org-edit-src-content-i.patch --]
[-- Type: text/plain, Size: 3404 bytes --]
From a8575e16e2496b2bdcddaaae2532f510a5b18908 Mon Sep 17 00:00:00 2001
From: Sebastian Miele <sebastian.miele@gmail.com>
Date: Wed, 9 Oct 2019 01:00:50 +0000
Subject: [PATCH] Respect buffer-local value of
`org-edit-src-content-indentation'
* lisp/org-src.el (org-src--content-indentation): Introduce
permanently buffer-local variable for storing away the potentially
buffer-local value of `org-edit-src-content-indentation' in the source
buffer.
(org-src--contents-for-write-back): Use `org-src--content-indentation'
instead of `org-edit-src-content-indentation' in the edit buffer.
(org-src--edit-element): Set `org-src--content-indentation' in editing
buffer. For greater clarity and consistency, rename already existing
let-bound variable `ind' to `block-ind'.
* etc/ORG-NEWS: Add entry.
---
etc/ORG-NEWS | 4 ++++
lisp/org-src.el | 15 ++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 283f32e0c..eab9e021b 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -434,6 +434,10 @@ leave unfolded subtrees unfolded.
I.e. treat the whole file as if it was a subtree.
*** Respect narrowing when agenda command is restricted to buffer
+*** Respect buffer-local value of ~org-edit-src-content-indentation~
+
+Use the potentially buffer-local value of `org-edit-src-content-indentation'
+from the source buffer instead of that from the editing buffer.
* Version 9.2
** Incompatible changes
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 9134d5b5d..418f3a662 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -258,6 +258,9 @@ issued in the language major mode buffer."
(defvar-local org-src--block-indentation nil)
(put 'org-src--block-indentation 'permanent-local t)
+(defvar-local org-src--content-indentation nil)
+(put 'org-src--content-indentation 'permanent-local t)
+
(defvar-local org-src--end-marker nil)
(put 'org-src--end-marker 'permanent-local t)
@@ -422,7 +425,7 @@ Assume point is in the corresponding edit buffer."
(if org-src--preserve-indentation 0
(+ (or org-src--block-indentation 0)
(if (memq org-src--source-type '(example-block src-block))
- org-edit-src-content-indentation
+ org-src--content-indentation
0))))
(use-tabs? (and (> org-src--tab-width 0) t))
(source-tab-width org-src--tab-width)
@@ -484,9 +487,10 @@ Leave point in edit buffer."
(source-file-name (buffer-file-name (buffer-base-buffer)))
(source-tab-width (if indent-tabs-mode tab-width 0))
(type (org-element-type datum))
- (ind (org-with-wide-buffer
- (goto-char (org-element-property :begin datum))
- (current-indentation)))
+ (block-ind (org-with-wide-buffer
+ (goto-char (org-element-property :begin datum))
+ (current-indentation)))
+ (content-ind org-edit-src-content-indentation)
(preserve-ind
(and (memq type '(example-block src-block))
(or (org-element-property :preserve-indent datum)
@@ -529,7 +533,8 @@ Leave point in edit buffer."
(setq org-src--end-marker end)
(setq org-src--remote remote)
(setq org-src--source-type type)
- (setq org-src--block-indentation ind)
+ (setq org-src--block-indentation block-ind)
+ (setq org-src--content-indentation content-ind)
(setq org-src--preserve-indentation preserve-ind)
(setq org-src--overlay overlay)
(setq org-src--allow-write-back write-back)
--
2.24.0
next prev parent reply other threads:[~2019-11-20 6:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-14 23:30 [PATCH] Respect buffer-local value of `org-edit-src-content-indentation' Sebastian Miele
2019-10-16 0:50 ` Adam Porter
2019-10-17 0:34 ` Sebastian Miele
2019-11-03 21:24 ` Nicolas Goaziou
2019-11-03 22:25 ` Sebastian Miele
2019-11-19 10:39 ` Nicolas Goaziou
2019-11-20 6:12 ` Sebastian Miele [this message]
2019-11-20 21:30 ` Nicolas Goaziou
2020-02-12 17:51 ` Bastien
2020-02-12 18:35 ` Sebastian Miele
2020-02-12 19:10 ` Bastien
2020-02-12 19:28 ` Sebastian Miele
2020-02-13 19:31 ` Sebastian Miele
2020-02-14 10:02 ` Bastien
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=874kyznkip.fsf@gmail.com \
--to=sebastian.miele@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=mail@nicolasgoaziou.fr \
/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).