diff options
| author | Bastien <bzg@gnu.org> | 2019-12-04 10:37:19 +0100 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2019-12-04 10:37:19 +0100 |
| commit | 46319b5f69e2ef912fa6024a558a6e2b5b14ed48 (patch) | |
| tree | 836b0d5a9d90ae45e8fd17e972a7546758f20894 | |
| parent | 8cd225a36caf891f2d223dee9cc7221e1a0a5700 (diff) | |
| download | org-mode-46319b5f69e2ef912fa6024a558a6e2b5b14ed48.tar.gz | |
Backport commit 8fb773cc91 from Emacs
| -rw-r--r-- | lisp/ob-eshell.el | 7 | ||||
| -rw-r--r-- | lisp/org-keys.el | 6 |
2 files changed, 11 insertions, 2 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/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)]) |