mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/org/org.el (org-mode): Add pcomplete-completions-at-point to capf.

Browse source 
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.
This commit is contained in:
Stefan Monnier 2019-11-18 17:47:06 -05:00
parent da00577793
commit 5bc97ebceb
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lisp/org/org.el
View file

@ -5541,11 +5541,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
@ -19501,7 +19503,7 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names."
(org-defkey org-mode-map "\C-i" 'org-cycle)
(org-defkey org-mode-map [(tab)] 'org-cycle)
(org-defkey org-mode-map [(control tab)] 'org-force-cycle-archived)
(org-defkey org-mode-map "\M-\t" #'pcomplete)
(org-defkey org-mode-map "\M-\t" nil) ;; Override text-mode binding
;; The following line is necessary under Suse GNU/Linux
(org-defkey org-mode-map [S-iso-lefttab] 'org-shifttab)
@ -19567,7 +19569,7 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names."
(org-defkey org-mode-map [?\C-c (right)] 'org-shiftright)
(org-defkey org-mode-map [?\C-c ?\C-x (right)] 'org-shiftcontrolright)
(org-defkey org-mode-map [?\C-c ?\C-x (left)] 'org-shiftcontrolleft)
(org-defkey org-mode-map [?\e (tab)] #'pcomplete)
(org-defkey org-mode-map [?\e (tab)] nil) ;; Override text-mode binding
(org-defkey org-mode-map [?\e (shift return)] 'org-insert-todo-heading)
(org-defkey org-mode-map [?\e (shift left)] 'org-shiftmetaleft)
(org-defkey org-mode-map [?\e (shift right)] 'org-shiftmetaright)