branch: externals/org
commit 5501a0f80cae515c535d835f01890ea2f16a6809
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Rename org-edit-src-content-indentation to org-src-content-indentation
* lisp/org-src.el (org-src-content-indentation): Rename from
`org-edit-src-content-indentation'.
* lisp/org-compat.el (org-edit-src-content-indentation): Declare
obsolete.
* etc/ORG-NEWS (~org-edit-src-content-indentation~ is renamed to
~org-src-content-indentation~): Announce the rename.
* .dir-locals.el (emacs-lisp-mode):
* lisp/ob-core.el:
* lisp/org-element.el:
* lisp/org.el:
* testing/lisp/test-ob.el:
* testing/lisp/test-org-element.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Use the new name.
Link: https://list.orgmode.org/orgmode/871pugjegp.fsf@localhost/
---
.dir-locals.el | 2 +-
etc/ORG-NEWS | 7 ++++
lisp/ob-core.el | 4 +-
lisp/org-compat.el | 2 +
lisp/org-element.el | 10 ++---
lisp/org-src.el | 8 ++--
lisp/org.el | 2 +-
testing/lisp/test-ob.el | 26 ++++++-------
testing/lisp/test-org-element.el | 18 ++++-----
testing/lisp/test-org-src.el | 80 ++++++++++++++++++++--------------------
testing/lisp/test-org.el | 20 +++++-----
11 files changed, 94 insertions(+), 85 deletions(-)
diff --git a/.dir-locals.el b/.dir-locals.el
index 83e51000fd..9cd2938b00 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -11,7 +11,7 @@
(org-mode
(indent-tabs-mode)
(org-adapt-indentation)
- (org-edit-src-content-indentation . 0)
+ (org-src-content-indentation . 0)
(org-footnote-auto-adjust . t)
(org-footnote-auto-label . t)
(org-footnote-define-inline . nil)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 06690ebd2e..0c4cdd3b62 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -610,6 +610,13 @@ constructed again.
** Removed or renamed functions and variables
+*** ~org-edit-src-content-indentation~ is renamed to
~org-src-content-indentation~
+
+The new name highlights that the customization affects more than
+editing. ~org-src-content-indentation~ also affects detangling,
+printing Org syntax tree (for example, during export to Org), and
+indentation of src and example blocks in Org buffers.
+
*** ~org-cycle-display-inline-images~ is renamed to
~org-cycle-display-link-previews~
Inline image previews in Org mode are now provided by the more general
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 23cf4d4516..c112d579de 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -42,7 +42,7 @@
nil))
(defvar org-babel-library-of-babel)
-(defvar org-edit-src-content-indentation)
+(defvar org-src-content-indentation)
(defvar org-link-file-path-type)
(defvar org-src-lang-modes)
(defvar org-babel-tangle-uncomment-comments)
@@ -2997,7 +2997,7 @@ used as a string to be appended to #+begin_example line."
(indent-rigidly
(point-min)
(point-max)
- (+ ind org-edit-src-content-indentation))
+ (+ ind org-src-content-indentation))
(buffer-string))))))
(delete-region body-start
(org-with-wide-buffer
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index fd2dc2e5ca..7ca0a9481e 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -536,6 +536,8 @@ Counting starts at 1."
(define-obsolete-function-alias 'org-string-match-p 'string-match-p "9.0")
;;;; Functions and variables from previous releases now obsolete.
+(define-obsolete-variable-alias 'org-edit-src-content-indentation
+ 'org-src-content-indentation "Org 9.8")
(define-obsolete-variable-alias 'org-export-ignored-local-variables
'org-element-ignored-local-variables "Org 9.7")
(define-obsolete-function-alias 'org-habit-get-priority
diff --git a/lisp/org-element.el b/lisp/org-element.el
index ea1abd1794..8afd67df9a 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -86,7 +86,7 @@
(defvar org-complex-heading-regexp)
(defvar org-done-keywords)
-(defvar org-edit-src-content-indentation)
+(defvar org-src-content-indentation)
(defvar org-match-substring-regexp)
(defvar org-odd-levels-only)
(defvar org-property-drawer-re)
@@ -2598,10 +2598,10 @@ Return a new syntax node of `example-block' type
containing `:begin',
(let ((val (org-element-property :value example-block)))
(cond
((org-src-preserve-indentation-p example-block) val)
- ((= 0 org-edit-src-content-indentation)
+ ((= 0 org-src-content-indentation)
(org-remove-indentation val))
(t
- (let ((ind (make-string org-edit-src-content-indentation ?\s)))
+ (let ((ind (make-string org-src-content-indentation ?\s)))
(replace-regexp-in-string "^[ \t]*\\S-"
(concat ind "\\&")
(org-remove-indentation val))))))))
@@ -3134,10 +3134,10 @@ Assume point is at the beginning of the block."
(let ((val (org-element-property :value src-block)))
(cond
((org-src-preserve-indentation-p src-block) val)
- ((zerop org-edit-src-content-indentation)
+ ((zerop org-src-content-indentation)
(org-remove-indentation val))
(t
- (let ((ind (make-string org-edit-src-content-indentation ?\s)))
+ (let ((ind (make-string org-src-content-indentation ?\s)))
(replace-regexp-in-string "^[ \t]*\\S-"
(concat ind "\\&")
(org-remove-indentation val))))))))
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 053e5d682f..31d210a40e 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -127,11 +127,11 @@ When this variable is nil, while indenting with
`\\[org-indent-block]'
or after editing with `\\[org-edit-src-code]', the minimum (across-lines)
number of leading whitespace characters are removed from all lines,
and the code block is uniformly indented according to the value of
-`org-edit-src-content-indentation'."
+`org-src-content-indentation'."
:group 'org-edit-structure
:type 'boolean)
-(defcustom org-edit-src-content-indentation 2
+(defcustom org-src-content-indentation 2
"Indentation for the content of a source code block.
This should be the number of spaces added to the indentation of the #+begin
@@ -592,7 +592,7 @@ Leave point in edit buffer."
(org--get-expected-indentation
(org-element-parent datum) nil))
(t (org-current-text-indentation)))))
- (content-ind org-edit-src-content-indentation)
+ (content-ind org-src-content-indentation)
(preserve-ind (org-src-preserve-indentation-p datum))
;; Store relative positions of mark (if any) and point
;; within the edited area.
@@ -768,7 +768,7 @@ as `org-src-fontify-natively' is non-nil."
(if (org-src-preserve-indentation-p) 0
(+ (progn (backward-char)
(org-current-text-indentation))
- org-edit-src-content-indentation))))
+ org-src-content-indentation))))
(while (re-search-forward "^[ ]*\t" end t)
(let* ((b (and (eq indent-offset (move-to-column indent-offset))
(point)))
diff --git a/lisp/org.el b/lisp/org.el
index 156b615674..b859a08795 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -19674,7 +19674,7 @@ Also align node properties according to
`org-property-format'."
(when (not (org-src-preserve-indentation-p element))
(org-with-point-at (org-element-property :begin element)
(+ (org-current-text-indentation)
- org-edit-src-content-indentation)))))
+ org-src-content-indentation)))))
;; Avoid over-indenting when beginning of a new line is not
empty.
;; https://list.orgmode.org/[email protected]/
(org-with-undo-amalgamate
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index 694a37a3a8..f91681f9e8 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -657,7 +657,7 @@ duplicate results block."
'foo
,#+end_src
#+end_src"
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-babel-execute-src-block))))))
@@ -2226,14 +2226,14 @@ default-directory
"Test `org-babel-update-block-body' specifications."
(should
(equal "#+begin_src elisp\n 2\n#+end_src"
- (let ((org-edit-src-content-indentation 2))
+ (let ((org-src-content-indentation 2))
(org-test-with-temp-text "#+begin_src elisp\n(+ 1 1)\n#+end_src"
(org-babel-update-block-body "2")
(buffer-string)))))
;; Preserve block indentation.
(should
(equal " #+begin_src elisp\n 2\n #+end_src"
- (let ((org-edit-src-content-indentation 1))
+ (let ((org-src-content-indentation 1))
(org-test-with-temp-text
" #+begin_src elisp\n (+ 1 1)\n #+end_src"
(org-babel-update-block-body "2")
@@ -2241,14 +2241,14 @@ default-directory
;; Ignore NEW-BODY global indentation.
(should
(equal "#+begin_src elisp\n 2\n#+end_src"
- (let ((org-edit-src-content-indentation 2))
+ (let ((org-src-content-indentation 2))
(org-test-with-temp-text "#+begin_src elisp\n(+ 1 1)\n#+end_src"
(org-babel-update-block-body " 2")
(buffer-string)))))
;; When indentation should be preserved ignore the two rules above.
(should
(equal " #+begin_src elisp\n2\n #+end_src"
- (let ((org-edit-src-content-indentation 1)
+ (let ((org-src-content-indentation 1)
(org-src-preserve-indentation t))
(org-test-with-temp-text
" #+begin_src elisp\n (+ 1 1)\n #+end_src"
@@ -2256,21 +2256,21 @@ default-directory
(buffer-string)))))
(should
(equal " #+begin_src elisp -i\n2\n #+end_src"
- (let ((org-edit-src-content-indentation 1))
+ (let ((org-src-content-indentation 1))
(org-test-with-temp-text
" #+begin_src elisp -i\n (+ 1 1)\n #+end_src"
(org-babel-update-block-body "2")
(buffer-string)))))
(should
(equal "#+begin_src elisp\n 2\n#+end_src"
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation t))
(org-test-with-temp-text "#+begin_src elisp\n(+ 1 1)\n#+end_src"
(org-babel-update-block-body " 2")
(buffer-string)))))
(should
(equal "#+begin_src elisp -i\n 2\n#+end_src"
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation t))
(org-test-with-temp-text "#+begin_src elisp -i\n(+ 1 1)\n#+end_src"
(org-babel-update-block-body " 2")
@@ -2660,7 +2660,7 @@ do not org-indent-block text here
(ert-deftest test-ob/demarcate-block-split-prefix-point ()
"Test prefix argument point splitting."
(let ((org-adapt-indentation t)
- (org-edit-src-content-indentation 2)
+ (org-src-content-indentation 2)
(org-src-preserve-indentation nil)
(ok-col 11)
(stars "^\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*"))
@@ -2683,14 +2683,14 @@ do not org-indent-block text here
(cond ((string= regexp stars)
(should (= 0 (current-column))))
((string-prefix-p ";;" regexp)
- (should (= (+ ok-col org-edit-src-content-indentation)
+ (should (= (+ ok-col org-src-content-indentation)
(current-column))))
(t (should (= ok-col (current-column)))))))))
(ert-deftest test-ob/demarcate-block-split-prefix-region ()
"Test prefix argument region splitting."
(let ((org-adapt-indentation t)
- (org-edit-src-content-indentation 2)
+ (org-src-content-indentation 2)
(org-src-preserve-indentation nil)
(ok-col 11)
(stars "^\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*")
@@ -2732,14 +2732,14 @@ do not org-indent-block text here
(cond ((string= regexp stars)
(should (= 0 (current-column))))
((memq regexp parts)
- (should (= (+ ok-col org-edit-src-content-indentation)
+ (should (= (+ ok-col org-src-content-indentation)
(current-column))))
(t (should (= ok-col (current-column)))))))))
(ert-deftest test-ob/demarcate-block-split-user-errors ()
"Test for `user-error's in splitting"
(let ((org-adapt-indentation t)
- (org-edit-src-content-indentation 2)
+ (org-src-content-indentation 2)
(org-src-preserve-indentation))
(let* ((caption "#+caption: caption.")
(within-body ";; within-body")
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index f1e3eb3752..34a914ef3d 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -3818,12 +3818,12 @@ CLOCK: [2012-01-01 sun. 00:01]--[2012-01-01 sun. 00:02]
=> 0:01")))
;; Handle indentation.
(should (equal "#+begin_example\n Test\n#+end_example\n"
(let ((org-src-preserve-indentation nil)
- (org-edit-src-content-indentation 2))
+ (org-src-content-indentation 2))
(org-test-parse-and-interpret
"#+BEGIN_EXAMPLE\nTest\n#+END_EXAMPLE"))))
(should (equal "#+begin_example\n Test\n#+end_example\n"
(let ((org-src-preserve-indentation t)
- (org-edit-src-content-indentation 2))
+ (org-src-content-indentation 2))
(org-test-parse-and-interpret
"#+BEGIN_EXAMPLE\n Test\n#+END_EXAMPLE")))))
@@ -3889,14 +3889,14 @@ DEADLINE: <2012-03-29 thu.> SCHEDULED: <2012-03-29
thu.> CLOSED: [2012-03-29 thu
"Test src block interpreter."
;; With arguments.
(should
- (equal (let ((org-edit-src-content-indentation 2)
+ (equal (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-test-parse-and-interpret
"#+BEGIN_SRC emacs-lisp :results silent\n(+ 1 1)\n#+END_SRC"))
"#+begin_src emacs-lisp :results silent\n (+ 1 1)\n#+end_src\n"))
;; With switches.
(should
- (equal (let ((org-edit-src-content-indentation 2)
+ (equal (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-test-parse-and-interpret
"#+BEGIN_SRC emacs-lisp -n -k\n(+ 1 1)\n#+END_SRC"))
@@ -3904,21 +3904,21 @@ DEADLINE: <2012-03-29 thu.> SCHEDULED: <2012-03-29
thu.> CLOSED: [2012-03-29 thu
;; Preserve code escaping.
(should
(equal
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-test-parse-and-interpret
"#+BEGIN_SRC org\n,* Headline\n,#+KEYWORD: value\nText\n#+END_SRC"))
"#+begin_src org\n ,* Headline\n ,#+KEYWORD: value\n
Text\n#+end_src\n"))
- ;; Do not apply `org-edit-src-content-indentation' when preserving
+ ;; Do not apply `org-src-content-indentation' when preserving
;; indentation.
(should
- (equal (let ((org-edit-src-content-indentation 2)
+ (equal (let ((org-src-content-indentation 2)
(org-src-preserve-indentation t))
(org-test-parse-and-interpret
"#+BEGIN_SRC emacs-lisp\n(+ 1 1)\n#+END_SRC"))
"#+begin_src emacs-lisp\n(+ 1 1)\n#+end_src\n"))
(should
- (equal (let ((org-edit-src-content-indentation 2)
+ (equal (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-test-parse-and-interpret
"#+BEGIN_SRC emacs-lisp -i\n(+ 1 1)\n#+END_SRC"))
@@ -3927,7 +3927,7 @@ DEADLINE: <2012-03-29 thu.> SCHEDULED: <2012-03-29 thu.>
CLOSED: [2012-03-29 thu
(should
(equal
"#+begin_src emacs-lisp\n Test\n#+end_src\n"
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-element-interpret-data
'(src-block (:language "emacs-lisp" :value "Test")))))))
diff --git a/testing/lisp/test-org-src.el b/testing/lisp/test-org-src.el
index e9fa9babd6..f655b7bca9 100644
--- a/testing/lisp/test-org-src.el
+++ b/testing/lisp/test-org-src.el
@@ -33,7 +33,7 @@
(message hello)
#+end_src
"
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-edit-special)
(insert "blah")
@@ -76,7 +76,7 @@
<point>#+begin_src emacs-lisp
#+end_src
"
- (let ((org-edit-src-content-indentation 0)
+ (let ((org-src-content-indentation 0)
(org-src-preserve-indentation nil))
(org-edit-special)
(insert "blah")
@@ -97,7 +97,7 @@ blah
#+end_src
"
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(goto-line 2)
(org-edit-special)
@@ -122,7 +122,7 @@ blah
#+begin_src emacs-lisp
<point>This is a tab:\t.
#+end_src"
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-edit-special)
(org-edit-src-exit)
@@ -138,7 +138,7 @@ This is a tab:\t.
#+begin_src emacs-lisp
<point>This is a tab:\t.
#+end_src"
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation t))
(org-edit-special)
(org-edit-src-exit)
@@ -160,11 +160,11 @@ This is a tab:\t.
abc<point>
#+end_src"
- (let ((org-edit-src-content-indentation 2)
- (org-src-preserve-indentation nil))
- (org-edit-special)
- (org-edit-src-exit)
- (buffer-string)))))
+ (let ((org-src-content-indentation 2)
+ (org-src-preserve-indentation nil))
+ (org-edit-special)
+ (org-edit-src-exit)
+ (buffer-string)))))
(should
(equal "
#+begin_src emacs-lisp
@@ -179,11 +179,11 @@ This is a tab:\t.
<point>
abc
#+end_src"
- (let ((org-edit-src-content-indentation 2)
- (org-src-preserve-indentation nil))
- (org-edit-special)
- (org-edit-src-exit)
- (buffer-string))))))
+ (let ((org-src-content-indentation 2)
+ (org-src-preserve-indentation nil))
+ (org-edit-special)
+ (org-edit-src-exit)
+ (buffer-string))))))
(ert-deftest test-org-src/coderef-format ()
"Test `org-src-coderef-format' specifications."
@@ -327,7 +327,7 @@ This is a tab:\t.
"- Item\n #+BEGIN_SRC emacs-lisp\n Foo\n #+END_SRC"
(org-test-with-temp-text
"- Item\n<point> #+BEGIN_SRC emacs-lisp\n (+ 1 1)\n #+END_SRC"
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-edit-special)
(erase-buffer)
@@ -359,7 +359,7 @@ This is a tab:\t.
argument2))
#+END_SRC"
(setq-local indent-tabs-mode t)
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-edit-special)
(org-edit-src-exit)
@@ -375,7 +375,7 @@ This is a tab:\t.
(progn\n (function argument1\n \targument2))
#+END_SRC"
(setq-local indent-tabs-mode nil)
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-edit-special)
(org-edit-src-exit)
@@ -392,7 +392,7 @@ This is a tab:\t.
#+END_SRC"
(setq-local indent-tabs-mode t)
(setq-local tab-width 4)
- (let ((org-edit-src-content-indentation 2)
+ (let ((org-src-content-indentation 2)
(org-src-preserve-indentation nil))
(org-edit-special)
(setq-local indent-tabs-mode t)
@@ -411,18 +411,18 @@ This is a tab:\t.
(progn
(list argument1\n \t<point>argument2))
#+END_SRC"
- (setq-local indent-tabs-mode t)
- (setq-local tab-width 4)
- (let ((org-edit-src-content-indentation 2)
- (org-src-preserve-indentation nil))
- (font-lock-ensure)
- ;; `current-column' will not work with older versions of emacs
- ;; before commit 4243747b1b8: Fix 'current-column' in the
- ;; presence of display strings
- (if (<= emacs-major-version 28)
- (+ (progn (backward-char) (length (get-text-property (point)
'display)))
- (current-column))
- (current-column))))))
+ (setq-local indent-tabs-mode t)
+ (setq-local tab-width 4)
+ (let ((org-src-content-indentation 2)
+ (org-src-preserve-indentation nil))
+ (font-lock-ensure)
+ ;; `current-column' will not work with older versions of emacs
+ ;; before commit 4243747b1b8: Fix 'current-column' in the
+ ;; presence of display strings
+ (if (<= emacs-major-version 28)
+ (+ (progn (backward-char) (length (get-text-property (point)
'display)))
+ (current-column))
+ (current-column))))))
;; The initial tab characters respect org's `tab-width'.
(should
(equal
@@ -433,15 +433,15 @@ This is a tab:\t.
\t(progn
\t (list argument1\n\t\t<point>argument2))
#+END_SRC"
- (setq-local indent-tabs-mode t)
- (setq-local tab-width 2)
- (let ((org-edit-src-content-indentation 2)
- (org-src-preserve-indentation nil))
- (font-lock-ensure)
- (if (<= emacs-major-version 28)
- (+ (progn (backward-char) (length (get-text-property (point)
'display)))
- (current-column))
- (current-column)))))))
+ (setq-local indent-tabs-mode t)
+ (setq-local tab-width 2)
+ (let ((org-src-content-indentation 2)
+ (org-src-preserve-indentation nil))
+ (font-lock-ensure)
+ (if (<= emacs-major-version 28)
+ (+ (progn (backward-char) (length (get-text-property (point)
'display)))
+ (current-column))
+ (current-column)))))))
(ert-deftest test-org-src/indented-latex-fragments ()
"Test editing multiline indented LaTeX fragment."
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index 8bc36a0e80..cd884c02fa 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -231,7 +231,7 @@ Otherwise, evaluate RESULT as an sexp and return its
result."
(should
(equal " ;; "
(org-test-with-temp-text "#+BEGIN_SRC emacs-lisp\n<point>\n#+END_SRC"
- (let ((org-edit-src-content-indentation 2))
+ (let ((org-src-content-indentation 2))
(call-interactively #'org-comment-dwim))
(buffer-substring-no-properties (line-beginning-position)
(point)))))
@@ -242,7 +242,7 @@ Otherwise, evaluate RESULT as an sexp and return its
result."
(transient-mark-mode 1)
(push-mark (point) t t)
(forward-line 2)
- (let ((org-edit-src-content-indentation 2))
+ (let ((org-src-content-indentation 2))
(call-interactively #'org-comment-dwim))
(buffer-string)))))
@@ -1232,14 +1232,14 @@ while the sphinx of black quartz judges my vow."
(current-indentation)))))
;; Within code part of a source block, use language major mode if
;; `org-src-tab-acts-natively' is non-nil, only add
- ;; `org-edit-src-content-indentation' to lines with indentation that
+ ;; `org-src-content-indentation' to lines with indentation that
;; is lower. Otherwise, indent according to line above.
(should
(= 6
(org-test-with-temp-text
"#+BEGIN_SRC emacs-lisp\n (and A\n<point>B)\n#+END_SRC"
(let ((org-src-tab-acts-natively t)
- (org-edit-src-content-indentation 0))
+ (org-src-content-indentation 0))
(org-indent-line))
(current-indentation))))
(should
@@ -1247,7 +1247,7 @@ while the sphinx of black quartz judges my vow."
(org-test-with-temp-text
"#+BEGIN_SRC emacs-lisp\n (and A\n<point>B)\n#+END_SRC"
(let ((org-src-tab-acts-natively t)
- (org-edit-src-content-indentation 2))
+ (org-src-content-indentation 2))
(org-indent-line))
(forward-line -1)
(current-indentation))))
@@ -1256,7 +1256,7 @@ while the sphinx of black quartz judges my vow."
(org-test-with-temp-text
"#+BEGIN_SRC emacs-lisp\n (and A\n<point>B)\n#+END_SRC"
(let ((org-src-tab-acts-natively nil)
- (org-edit-src-content-indentation 0))
+ (org-src-content-indentation 0))
(org-indent-line))
(current-indentation))))
;; Otherwise, indent like the first non-blank line above.
@@ -1353,7 +1353,7 @@ while the sphinx of black quartz judges my vow."
(org-test-with-temp-text
"#+BEGIN_SRC emacs-lisp\n (and A\nB)\n#+END_SRC"
(let ((org-src-tab-acts-natively t)
- (org-edit-src-content-indentation 0))
+ (org-src-content-indentation 0))
(org-indent-region (point-min) (point-max)))
(buffer-string))))
(should
@@ -1361,7 +1361,7 @@ while the sphinx of black quartz judges my vow."
(org-test-with-temp-text
"#+BEGIN_SRC emacs-lisp\n (and A\nB)\n#+END_SRC"
(let ((org-src-tab-acts-natively nil)
- (org-edit-src-content-indentation 0))
+ (org-src-content-indentation 0))
(org-indent-region (point-min) (point-max)))
(buffer-string))))
;; Align node properties according to `org-property-format'. Handle
@@ -1767,9 +1767,9 @@ CLOCK: [2022-09-17 sam. 11:00]--[2022-09-17 sam. 11:46]
=> 0:46"
(buffer-string)))))
;; Make sure that we do not mess things up when indenting remotely
;; in src block buffer.
- (let ((org-edit-src-content-indentation 2))
+ (let ((org-src-content-indentation 2))
(should
- ;; Add `org-edit-src-content-indentation' and no more.
+ ;; Add `org-src-content-indentation' and no more.
;;
https://orgmode.org/list/5O9VMGb6WRaqeHR5_NXTb832Z2Lek_5L40YPDA52-S3kPwGYJspI8kLWaGtuq3DXyhtHpj1J7jTIXb39RX9BtCa2ecrWHjijZqI8QAD742U=@proton.me
(equal "#+begin_src fundamental\n \n#+end_src" ; 2 spaces
(org-test-with-temp-text "#+begin_src
fundamental<point>\n#+end_src"
