diff options
author | Kyle Meyer <kyle@kyleam.com> | 2019-12-01 21:32:43 -0500 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2019-12-01 21:32:43 -0500 |
commit | aeaaf39381c896b624e00ceb5374e6feb6094561 (patch) | |
tree | cb74aa67ebf28bf49f3199e3b27020218a9ff420 | |
parent | 8ded89cc386ff5487823fa0ac686baf553c60122 (diff) | |
parent | ad171650bb8a0811144a594f719477300ed9d7a7 (diff) | |
download | org-mode-aeaaf39381c896b624e00ceb5374e6feb6094561.tar.gz |
Merge branch 'master' into next
-rw-r--r-- | lisp/org-keys.el | 10 | ||||
-rw-r--r-- | lisp/org.el | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/org-keys.el b/lisp/org-keys.el index a67853e..ae4f60d 100644 --- a/lisp/org-keys.el +++ b/lisp/org-keys.el @@ -441,10 +441,12 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names." (org-defkey org-mode-map (kbd "C-i") #'org-cycle) (org-defkey org-mode-map (kbd "<tab>") #'org-cycle) (org-defkey org-mode-map (kbd "C-<tab>") #'org-force-cycle-archived) -(org-defkey org-mode-map (kbd "M-<tab>") #'pcomplete) -(org-defkey org-mode-map (kbd "M-TAB") #'pcomplete) -(org-defkey org-mode-map (kbd "ESC <tab>") #'pcomplete) -(org-defkey org-mode-map (kbd "ESC TAB") #'pcomplete) +;; Override text-mode binding to expose `complete-symbol' for +;; pcomplete functionality. +(org-defkey org-mode-map (kbd "M-<tab>") nil) +(org-defkey org-mode-map (kbd "M-TAB") nil) +(org-defkey org-mode-map (kbd "ESC <tab>") nil) +(org-defkey org-mode-map (kbd "ESC TAB") nil) (org-defkey org-mode-map (kbd "<S-iso-leftab>") #'org-shifttab) (org-defkey org-mode-map (kbd "S-<tab>") #'org-shifttab) diff --git a/lisp/org.el b/lisp/org.el index 20c263f..d78321e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4928,11 +4928,13 @@ The following commands are available: (lambda (&rest _) (org-show-context 'isearch))) ;; Setup the pcomplete hooks - (setq-local pcomplete-command-completion-function 'org-pcomplete-initial) - (setq-local pcomplete-command-name-function 'org-command-at-point) - (setq-local pcomplete-default-completion-function 'ignore) - (setq-local pcomplete-parse-arguments-function 'org-parse-arguments) + (setq-local pcomplete-command-completion-function #'org-pcomplete-initial) + (setq-local pcomplete-command-name-function #'org-command-at-point) + (setq-local pcomplete-default-completion-function #'ignore) + (setq-local pcomplete-parse-arguments-function #'org-parse-arguments) (setq-local pcomplete-termination-string "") + (add-hook 'completion-at-point-functions + #'pcomplete-completions-at-point nil t) (setq-local buffer-face-mode-face 'org-default) ;; If empty file that did not turn on Org mode automatically, make |