summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2019-11-18 17:47:06 -0500
committerKyle Meyer <kyle@kyleam.com>2019-12-01 21:28:39 -0500
commitf2d03cb6b420e865427c3ab8a0af1847e6d09fd5 (patch)
treea270661674193204a0af9ba1d7f637803a86653f
parent634880a2e94eca78f57deb0e4331d74e75450d24 (diff)
downloadorg-mode-f2d03cb6b420e865427c3ab8a0af1847e6d09fd5.tar.gz
Backport commit 5bc97ebce from Emacs
* lisp/org.el (org-mode): Add pcomplete-completions-at-point to capf. This lets the normal `completion-at-point` and `complete-symbol` use `pcomplete` for completion. (org-mode-map): Leave M-TAB bound to the global default since `pcomplete` is now obsolete. 5bc97ebceb54e0eb2804bef4c1bc32a40d8a2371 Stefan Monnier Mon Nov 18 17:47:06 2019 -0500
-rw-r--r--lisp/org.el20
1 files changed, 12 insertions, 8 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 2cea47d..1da2779 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5560,11 +5560,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
@@ -18936,10 +18938,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)