From f487fccbec50116986f85fc413f29fd2f3f463df Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 11 Feb 2018 11:40:21 +0100 Subject: [PATCH] org-macs: Use `define-key' instead of `org-defkey' * lisp/org-macs.el (org-completing-read): Use `define-key' instead of `org-defkey'. For bootstrapping reasons, "org-macs.el" isn't expected to require functions from "org.el". Besides, minibuffer isn't supposed to depend of `org-disputed-keys' either. --- lisp/org-macs.el | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index e2e1857fe..6b3de4586 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -31,8 +31,6 @@ ;;; Code: -(declare-function org-defkey "org" (keymap key def)) - ;;; Macros @@ -240,10 +238,10 @@ error when the user input is empty." (let ((enable-recursive-minibuffers t) (minibuffer-local-completion-map (copy-keymap minibuffer-local-completion-map))) - (org-defkey minibuffer-local-completion-map " " 'self-insert-command) - (org-defkey minibuffer-local-completion-map "?" 'self-insert-command) - (org-defkey minibuffer-local-completion-map (kbd "C-c !") - 'org-time-stamp-inactive) + (define-key minibuffer-local-completion-map " " 'self-insert-command) + (define-key minibuffer-local-completion-map "?" 'self-insert-command) + (define-key minibuffer-local-completion-map (kbd "C-c !") + 'org-time-stamp-inactive) (apply #'completing-read args)))