diff options
| author | Juanma Barranquero | 2019-12-04 07:05:14 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2019-12-04 07:05:14 +0100 |
| commit | 8fb773cc919e02e06cb1640448f4d8be19c61b30 (patch) | |
| tree | a8e0896dc90914e72b4e531a9d8d4be6dda03f93 | |
| parent | 0db82bc09fb9144e290b8d47dde8b29a04e3885a (diff) | |
| download | emacs-8fb773cc919e02e06cb1640448f4d8be19c61b30.tar.gz emacs-8fb773cc919e02e06cb1640448f4d8be19c61b30.zip | |
Silence warnings in Org 9.3
* lisp/org/ob-eshell.el (eshell-send-input): Declare.
(eshell-last-output-start, eshell-last-output-end)
(eshell-last-input-end): Defvar.
* lisp/org/org-keys.el (cl-lib): Require.
(org-CUA-compatible): Move up defvaralias.
| -rw-r--r-- | lisp/org/ob-eshell.el | 7 | ||||
| -rw-r--r-- | lisp/org/org-keys.el | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/org/ob-eshell.el b/lisp/org/ob-eshell.el index 1090bef62f5..bfb24f8a655 100644 --- a/lisp/org/ob-eshell.el +++ b/lisp/org/ob-eshell.el | |||
| @@ -29,6 +29,13 @@ | |||
| 29 | (require 'ob) | 29 | (require 'ob) |
| 30 | (require 'eshell) | 30 | (require 'eshell) |
| 31 | 31 | ||
| 32 | (declare-function eshell-send-input "esh-mode" | ||
| 33 | (&optional use-region queue-p no-newline)) | ||
| 34 | |||
| 35 | (defvar eshell-last-output-start) | ||
| 36 | (defvar eshell-last-output-end) | ||
| 37 | (defvar eshell-last-input-end) | ||
| 38 | |||
| 32 | (defvar org-babel-default-header-args:eshell '()) | 39 | (defvar org-babel-default-header-args:eshell '()) |
| 33 | 40 | ||
| 34 | (defun org-babel-execute:eshell (body params) | 41 | (defun org-babel-execute:eshell (body params) |
diff --git a/lisp/org/org-keys.el b/lisp/org/org-keys.el index daad26dbf33..3b8fa5f53be 100644 --- a/lisp/org/org-keys.el +++ b/lisp/org/org-keys.el | |||
| @@ -27,6 +27,8 @@ | |||
| 27 | 27 | ||
| 28 | ;;; Code: | 28 | ;;; Code: |
| 29 | 29 | ||
| 30 | (require 'cl-lib) | ||
| 31 | |||
| 30 | (defvar org-outline-regexp) | 32 | (defvar org-outline-regexp) |
| 31 | 33 | ||
| 32 | (declare-function org-add-note "org" ()) | 34 | (declare-function org-add-note "org" ()) |
| @@ -218,6 +220,8 @@ | |||
| 218 | (defvar org-mode-map (make-sparse-keymap) | 220 | (defvar org-mode-map (make-sparse-keymap) |
| 219 | "Keymap fo Org mode.") | 221 | "Keymap fo Org mode.") |
| 220 | 222 | ||
| 223 | (defvaralias 'org-CUA-compatible 'org-replace-disputed-keys) | ||
| 224 | |||
| 221 | (defcustom org-replace-disputed-keys nil | 225 | (defcustom org-replace-disputed-keys nil |
| 222 | "Non-nil means use alternative key bindings for some keys. | 226 | "Non-nil means use alternative key bindings for some keys. |
| 223 | 227 | ||
| @@ -244,8 +248,6 @@ loading Org." | |||
| 244 | :type 'boolean | 248 | :type 'boolean |
| 245 | :safe #'booleanp) | 249 | :safe #'booleanp) |
| 246 | 250 | ||
| 247 | (defvaralias 'org-CUA-compatible 'org-replace-disputed-keys) | ||
| 248 | |||
| 249 | (defcustom org-disputed-keys | 251 | (defcustom org-disputed-keys |
| 250 | '(([(shift up)] . [(meta p)]) | 252 | '(([(shift up)] . [(meta p)]) |
| 251 | ([(shift down)] . [(meta n)]) | 253 | ([(shift down)] . [(meta n)]) |