Mercurial > emacs
changeset 93587:f4738cb320e1
(shell-dynamic-complete-filename): New fun.
(shell-dynamic-complete-functions): Use it.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 03 Apr 2008 05:13:15 +0000 |
| parents | 0987ba5aef55 |
| children | 917824e47986 |
| files | lisp/shell.el |
| diffstat | 1 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/shell.el Thu Apr 03 05:12:57 2008 +0000 +++ b/lisp/shell.el Thu Apr 03 05:13:15 2008 +0000 @@ -186,7 +186,7 @@ shell-dynamic-complete-environment-variable shell-dynamic-complete-command shell-replace-by-expanded-directory - comint-dynamic-complete-filename) + shell-dynamic-complete-filename) "List of functions called to perform completion. This variable is used to initialize `comint-dynamic-complete-functions' in the shell buffer. @@ -1010,6 +1010,19 @@ (insert " ")) success))) +(defun shell-dynamic-complete-filename () + "Dynamically complete the filename at point. +This completes only if point is at a suitable position for a +filename argument." + (interactive) + (let ((opoint (point)) + (beg (comint-line-beginning-position))) + (when (save-excursion + (goto-char (if (re-search-backward "[;|&]" beg t) + (match-end 0) + beg)) + (re-search-forward "[^ \t][ \t]" opoint t)) + (comint-dynamic-complete-as-filename)))) (defun shell-match-partial-variable () "Return the shell variable at point, or nil if none is found." @@ -1023,7 +1036,6 @@ (re-search-forward "\\$?{?[A-Za-z0-9_]*}?" limit) (buffer-substring (match-beginning 0) (match-end 0)))))) - (defun shell-dynamic-complete-environment-variable () "Dynamically complete the environment variable at point. Completes if after a variable, i.e., if it starts with a \"$\".