mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2019-12-01 21:28:58 -05:00
parent be7e88ae30 f2d03cb6b4
commit ad171650bb
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org-keys.el
View File

@ -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)

10
lisp/org.el
View File

@ -4910,11 +4910,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