mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-27 11:30:57 +00:00
Merge branch 'maint'
This commit is contained in:
commit
fe2db1ee8f
|
@ -29,6 +29,13 @@
|
|||
(require 'ob)
|
||||
(require 'eshell)
|
||||
|
||||
(declare-function eshell-send-input "esh-mode"
|
||||
(&optional use-region queue-p no-newline))
|
||||
|
||||
(defvar eshell-last-output-start)
|
||||
(defvar eshell-last-output-end)
|
||||
(defvar eshell-last-input-end)
|
||||
|
||||
(defvar org-babel-default-header-args:eshell '())
|
||||
|
||||
(defun org-babel-execute:eshell (body params)
|
||||
|
|
|
@ -69,10 +69,11 @@ function to convert variables to PlantUML assignments.
|
|||
|
||||
If BODY does not contain @startXXX ... @endXXX clauses, @startuml
|
||||
... @enduml will be added."
|
||||
(let ((assignments (org-babel-variable-assignments:plantuml params)))
|
||||
(if (string-prefix-p "@start" body t) assignments
|
||||
(format "@startuml\n%s\n@enduml"
|
||||
(org-babel-expand-body:generic body params assignments)))))
|
||||
(let ((full-body
|
||||
(org-babel-expand-body:generic
|
||||
body params (org-babel-variable-assignments:plantuml params))))
|
||||
(if (string-prefix-p "@start" body t) full-body
|
||||
(format "@startuml\n%s\n@enduml" full-body))))
|
||||
|
||||
(defun org-babel-execute:plantuml (body params)
|
||||
"Execute a block of plantuml code with org-babel.
|
||||
|
|
|
@ -27,6 +27,8 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
(require 'cl-lib)
|
||||
|
||||
(defvar org-outline-regexp)
|
||||
|
||||
(declare-function org-add-note "org" ())
|
||||
|
@ -218,6 +220,8 @@
|
|||
(defvar org-mode-map (make-sparse-keymap)
|
||||
"Keymap fo Org mode.")
|
||||
|
||||
(defvaralias 'org-CUA-compatible 'org-replace-disputed-keys)
|
||||
|
||||
(defcustom org-replace-disputed-keys nil
|
||||
"Non-nil means use alternative key bindings for some keys.
|
||||
|
||||
|
@ -244,8 +248,6 @@ loading Org."
|
|||
:type 'boolean
|
||||
:safe #'booleanp)
|
||||
|
||||
(defvaralias 'org-CUA-compatible 'org-replace-disputed-keys)
|
||||
|
||||
(defcustom org-disputed-keys
|
||||
'(([(shift up)] . [(meta p)])
|
||||
([(shift down)] . [(meta n)])
|
||||
|
|
Loading…
Reference in a new issue