From 8fb773cc919e02e06cb1640448f4d8be19c61b30 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 4 Dec 2019 07:05:14 +0100 Subject: [PATCH] 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. --- lisp/org/ob-eshell.el | 7 +++++++ 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 @@ (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/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 @@ ;;; 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)]) -- 2.39.2