mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-22 10:10:42 +00:00
Merge branch 'master' of orgmode.org:org-mode
This commit is contained in:
commit
e236d54acc
|
@ -551,7 +551,7 @@ with a prefix argument then this is passed on to
|
||||||
Return t if a code block was found at point, nil otherwise."
|
Return t if a code block was found at point, nil otherwise."
|
||||||
`(let ((org-src-window-setup 'switch-invisibly))
|
`(let ((org-src-window-setup 'switch-invisibly))
|
||||||
(when (and (org-babel-where-is-src-block-head)
|
(when (and (org-babel-where-is-src-block-head)
|
||||||
(org-edit-src-code nil nil nil 'quietly))
|
(org-edit-src-code nil nil nil))
|
||||||
(unwind-protect (progn ,@body)
|
(unwind-protect (progn ,@body)
|
||||||
(if (org-bound-and-true-p org-edit-src-from-org-mode)
|
(if (org-bound-and-true-p org-edit-src-from-org-mode)
|
||||||
(org-edit-src-exit)))
|
(org-edit-src-exit)))
|
||||||
|
|
|
@ -116,8 +116,7 @@ buffer.")
|
||||||
(defcustom org-edit-src-persistent-message t
|
(defcustom org-edit-src-persistent-message t
|
||||||
"Non-nil means show persistent exit help message while editing src examples.
|
"Non-nil means show persistent exit help message while editing src examples.
|
||||||
The message is shown in the header-line, which will be created in the
|
The message is shown in the header-line, which will be created in the
|
||||||
first line of the window showing the editing buffer.
|
first line of the window showing the editing buffer."
|
||||||
When nil, the message will only be shown intermittently in the echo area."
|
|
||||||
:group 'org-edit-structure
|
:group 'org-edit-structure
|
||||||
:type 'boolean)
|
:type 'boolean)
|
||||||
|
|
||||||
|
@ -199,7 +198,7 @@ This minor mode is turned on in two situations:
|
||||||
There is a mode hook, and keybindings for `org-edit-src-exit' and
|
There is a mode hook, and keybindings for `org-edit-src-exit' and
|
||||||
`org-edit-src-save'")
|
`org-edit-src-save'")
|
||||||
|
|
||||||
(defun org-edit-src-code (&optional context code edit-buffer-name quietp)
|
(defun org-edit-src-code (&optional context code edit-buffer-name)
|
||||||
"Edit the source code example at point.
|
"Edit the source code example at point.
|
||||||
The example is copied to a separate buffer, and that buffer is
|
The example is copied to a separate buffer, and that buffer is
|
||||||
switched to the correct language mode. When done, exit with
|
switched to the correct language mode. When done, exit with
|
||||||
|
@ -322,7 +321,6 @@ buffer."
|
||||||
(set-buffer-modified-p nil)
|
(set-buffer-modified-p nil)
|
||||||
(and org-edit-src-persistent-message
|
(and org-edit-src-persistent-message
|
||||||
(org-set-local 'header-line-format msg)))
|
(org-set-local 'header-line-format msg)))
|
||||||
(unless quietp (message "%s" msg))
|
|
||||||
t)))
|
t)))
|
||||||
|
|
||||||
(defun org-edit-src-continue (e)
|
(defun org-edit-src-continue (e)
|
||||||
|
|
Loading…
Reference in a new issue