summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-11 11:40:21 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-11 11:40:21 +0100
commitf487fccbec50116986f85fc413f29fd2f3f463df (patch)
tree612c2882d116743c79b9ccdb63022ebc09b4008a
parent013941de86e0f70554ecc5a87abd53562f4be897 (diff)
downloadorg-mode-f487fccbec50116986f85fc413f29fd2f3f463df.tar.gz
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.
-rw-r--r--lisp/org-macs.el10
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index e2e1857..6b3de45 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)))