diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-10-22 15:38:35 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-10-22 15:38:35 +0200 |
commit | 59d21881b13bfdbe78b0228a3e9174e48ec6f792 (patch) | |
tree | e6992d0031c40f24cf78f4f2eae7f58c4ea7984c | |
parent | 486331e323f428e3b15563d4f38c0a6132efbf73 (diff) | |
download | org-mode-59d21881b13bfdbe78b0228a3e9174e48ec6f792.tar.gz |
Revert "Move `org-key' and `org-defkey' into "org-macs.el""
This reverts commit 7f56a9920fff6c3538f30df2cc1c04cefe4f803b.
`org-key' is specific to Org keybinding, therefore not generic enough
to fit in "org-macs.el". So is `org-defkey'.
-rw-r--r-- | lisp/org-macs.el | 21 | ||||
-rw-r--r-- | lisp/org.el | 14 |
2 files changed, 14 insertions, 21 deletions
diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 5d1eaf9..8ce2919 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -31,9 +31,6 @@ ;;; Code: -(defvar org-disputed-keys) -(defvar org-replace-disputed-keys) - ;;; Macros @@ -224,24 +221,6 @@ error when the user input is empty." -;;; Keybinding - -(defun org-key (key) - "Select key according to `org-replace-disputed-keys' and `org-disputed-keys'. -Or return the original if not disputed." - (when org-replace-disputed-keys - (let* ((nkey (key-description key)) - (x (cl-find-if (lambda (x) (equal (key-description (car x)) nkey)) - org-disputed-keys))) - (setq key (if x (cdr x) key)))) - key) - -(defun org-defkey (keymap key def) - "Define a key, possibly translated, as returned by `org-key'." - (define-key keymap (org-key key) def)) - - - ;;; Overlays (defun org-overlay-display (ovl text &optional face evap) diff --git a/lisp/org.el b/lisp/org.el index 5d2073a..eac3931 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -1107,6 +1107,20 @@ therefore you'll have to restart Emacs to apply it after changing." :group 'org-startup :type 'alist) +(defun org-key (key) + "Select key according to `org-replace-disputed-keys' and `org-disputed-keys'. +Or return the original if not disputed." + (when org-replace-disputed-keys + (let* ((nkey (key-description key)) + (x (cl-find-if (lambda (x) (equal (key-description (car x)) nkey)) + org-disputed-keys))) + (setq key (if x (cdr x) key)))) + key) + +(defun org-defkey (keymap key def) + "Define a key, possibly translated, as returned by `org-key'." + (define-key keymap (org-key key) def)) + (defcustom org-ellipsis nil "The ellipsis to use in the Org mode outline. |