diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-12-04 18:46:44 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-12-04 18:46:44 +0100 |
| commit | fe2db1ee8f185aacec70d7f46f77c0ce8ae19eb5 (patch) | |
| tree | 1648216ed79b346c041662110abda8cbbe913c58 | |
| parent | 36753ee650dfb39bb9896d8410d70a742296ab5e (diff) | |
| parent | 18ddc6436255d34f8c67be9a4f6f970a50f583b9 (diff) | |
| download | org-mode-fe2db1ee8f185aacec70d7f46f77c0ce8ae19eb5.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ob-eshell.el | 7 | ||||
| -rw-r--r-- | lisp/ob-plantuml.el | 9 | ||||
| -rw-r--r-- | lisp/org-keys.el | 6 |
3 files changed, 16 insertions, 6 deletions
diff --git a/lisp/ob-eshell.el b/lisp/ob-eshell.el index 1090bef..bfb24f8 100644 --- a/lisp/ob-eshell.el +++ b/lisp/ob-eshell.el @@ -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) diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index 09c9a33..28c7b85 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -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. diff --git a/lisp/org-keys.el b/lisp/org-keys.el index daad26d..3b8fa5f 100644 --- a/lisp/org-keys.el +++ b/lisp/org-keys.el @@ -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)]) |