Mercurial > emacs
comparison lisp/shell.el @ 43529:7f72a2792acc
(shell-pcomplete-setup-done): New variable.
(shell-pcomplete): Use it instead of shell-pcomplete-setup-p.
(shell-pcomplete-reverse): Ditto.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Mon, 25 Feb 2002 21:04:00 +0000 |
| parents | c61a65062ae1 |
| children | a0885debe0c5 |
comparison
equal
deleted
inserted
replaced
| 43528:788ea5463404 | 43529:7f72a2792acc |
|---|---|
| 856 (if (re-search-backward | 856 (if (re-search-backward |
| 857 (format "[;&|]+[\t ]*\\(%s\\)" shell-command-regexp) limit 'move arg) | 857 (format "[;&|]+[\t ]*\\(%s\\)" shell-command-regexp) limit 'move arg) |
| 858 (progn (goto-char (match-beginning 1)) | 858 (progn (goto-char (match-beginning 1)) |
| 859 (skip-chars-forward ";&|"))))) | 859 (skip-chars-forward ";&|"))))) |
| 860 | 860 |
| 861 (defvar shell-pcomplete-setup-done nil) | |
| 862 | |
| 861 (defun shell-pcomplete () | 863 (defun shell-pcomplete () |
| 862 "Cycle forwards through completions at point, using `pcomplete'. | 864 "Cycle forwards through completions at point, using `pcomplete'. |
| 863 This function merely invokes `pcomplete', after ensuring this buffer | 865 This function merely invokes `pcomplete', after ensuring this buffer |
| 864 is set up for it." | 866 is set up for it." |
| 865 (interactive) | 867 (interactive) |
| 866 (unless (prog1 shell-pcomplete-setup-p | 868 (unless shell-pcomplete-setup-done |
| 867 (setq shell-pcomplete-setup-p t)) | 869 (setq shell-pcomplete-setup-done t) |
| 868 (pcomplete-comint-setup 'shell-dynamic-complete-functions)) | 870 (pcomplete-comint-setup 'shell-dynamic-complete-functions)) |
| 869 ;; Convince pcomplete we are calling it directly | 871 ;; Convince pcomplete we are calling it directly |
| 870 (setq this-command 'pcomplete) | 872 (setq this-command 'pcomplete) |
| 871 (call-interactively #'pcomplete)) | 873 (call-interactively #'pcomplete)) |
| 872 | 874 |
| 873 (defun shell-pcomplete-reverse () | 875 (defun shell-pcomplete-reverse () |
| 874 "Cycle backwards through completions at point, using `pcomplete'. | 876 "Cycle backwards through completions at point, using `pcomplete'. |
| 875 This function merely invokes `pcomplete-reverse', after ensuring this | 877 This function merely invokes `pcomplete-reverse', after ensuring this |
| 876 buffer is set up for it." | 878 buffer is set up for it." |
| 877 (interactive) | 879 (interactive) |
| 878 (unless (prog1 shell-pcomplete-setup-p | 880 (unless shell-pcomplete-setup-done |
| 879 (setq shell-pcomplete-setup-p t)) | 881 (setq shell-pcomplete-setup-done t) |
| 880 (pcomplete-comint-setup 'shell-dynamic-complete-functions)) | 882 (pcomplete-comint-setup 'shell-dynamic-complete-functions)) |
| 881 ;; Convince pcomplete we are calling it directly | 883 ;; Convince pcomplete we are calling it directly |
| 882 (setq this-command 'pcomplete-reverse) | 884 (setq this-command 'pcomplete-reverse) |
| 883 (call-interactively #'pcomplete-reverse)) | 885 (call-interactively #'pcomplete-reverse)) |
| 884 | 886 |