mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 19:37:52 +00:00
Merge branch 'maint'
This commit is contained in:
commit
a103f3f3ee
|
@ -238,7 +238,10 @@ should be asked whether to allow evaluation."
|
|||
(if (functionp org-confirm-babel-evaluate)
|
||||
(funcall org-confirm-babel-evaluate
|
||||
;; Language, code block body.
|
||||
(nth 0 info) (nth 1 info))
|
||||
(nth 0 info)
|
||||
(if (org-babel-noweb-p headers :eval)
|
||||
(org-babel-expand-noweb-references info)
|
||||
(nth 1 info)))
|
||||
org-confirm-babel-evaluate))))
|
||||
(cond
|
||||
(noeval nil)
|
||||
|
|
|
@ -3032,7 +3032,7 @@ With a prefix argument ARG, change the region in a single item."
|
|||
(if (org-region-active-p)
|
||||
(setq beg (funcall skip-blanks (region-beginning))
|
||||
end (copy-marker (region-end)))
|
||||
(setq beg (funcall skip-blanks (point-at-bol))
|
||||
(setq beg (point-at-bol)
|
||||
end (copy-marker (point-at-eol))))
|
||||
;; Depending on the starting line, choose an action on the text
|
||||
;; between BEG and END.
|
||||
|
|
|
@ -1925,6 +1925,25 @@ default-directory
|
|||
(message (car pair))
|
||||
(should (eq (org-test-babel-confirm-evaluate (car pair)) (cdr pair)))))))
|
||||
|
||||
(ert-deftest test-ob/check-eval-noweb-expanded ()
|
||||
"`org-confirm-babel-evaluate' function receives expanded noweb refs."
|
||||
(should
|
||||
(equal t
|
||||
(org-test-with-temp-text "
|
||||
#+name: foo
|
||||
#+begin_src emacs-lisp
|
||||
:bar
|
||||
#+end_src
|
||||
|
||||
<point>#+begin_src emacs-lisp :noweb yes
|
||||
<<foo>>
|
||||
#+end_src"
|
||||
(let ((org-confirm-babel-evaluate
|
||||
(lambda (_ body)
|
||||
(not (string-match-p ":bar" body)))))
|
||||
(org-babel-check-confirm-evaluate
|
||||
(org-babel-get-src-block-info)))))))
|
||||
|
||||
(defun org-test-ob/update-block-body ()
|
||||
"Test `org-babel-update-block-body' specifications."
|
||||
(should
|
||||
|
|
|
@ -1109,6 +1109,13 @@ b. Item 2<point>"
|
|||
(org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:END:\n\n\nText"
|
||||
(org-toggle-item nil)
|
||||
(buffer-string))))
|
||||
;; When no region is marked and point is on a blank line
|
||||
;; only operate on current line.
|
||||
(should
|
||||
(equal " \n* H :tag:"
|
||||
(org-test-with-temp-text "<point> \n* H :tag:"
|
||||
(org-toggle-item nil)
|
||||
(buffer-string))))
|
||||
;; When a region is marked and first line is a headline, all
|
||||
;; headlines are turned into items.
|
||||
(should
|
||||
|
|
Loading…
Reference in a new issue