diff options
| author | Juri Linkov | 2008-03-21 23:52:27 +0000 |
|---|---|---|
| committer | Juri Linkov | 2008-03-21 23:52:27 +0000 |
| commit | c35be7ec907278bf13968530b2c091fd91a93eba (patch) | |
| tree | 26fbd6b8e727e7043bcfdb783b37c785fad86904 | |
| parent | 4b0dc1de40c1cc113f1f508be94a7f6a24cd1fcf (diff) | |
| download | emacs-c35be7ec907278bf13968530b2c091fd91a93eba.tar.gz emacs-c35be7ec907278bf13968530b2c091fd91a93eba.zip | |
(shell-dynamic-complete-command)
(shell-dynamic-complete-environment-variable): Don't display
completion messages when command is called in the minibuffer.
| -rw-r--r-- | lisp/shell.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index b4b3dbf5283..7d20a877811 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -965,7 +965,8 @@ Returns t if successful." | |||
| 965 | (save-match-data (not (string-match "[~/]" filename))) | 965 | (save-match-data (not (string-match "[~/]" filename))) |
| 966 | (eq (match-beginning 0) | 966 | (eq (match-beginning 0) |
| 967 | (save-excursion (shell-backward-command 1) (point)))) | 967 | (save-excursion (shell-backward-command 1) (point)))) |
| 968 | (prog2 (message "Completing command name...") | 968 | (prog2 (unless (window-minibuffer-p (selected-window)) |
| 969 | (message "Completing command name...")) | ||
| 969 | (shell-dynamic-complete-as-command))))) | 970 | (shell-dynamic-complete-as-command))))) |
| 970 | 971 | ||
| 971 | 972 | ||
| @@ -1040,7 +1041,8 @@ Returns non-nil if successful." | |||
| 1040 | (interactive) | 1041 | (interactive) |
| 1041 | (let ((variable (shell-match-partial-variable))) | 1042 | (let ((variable (shell-match-partial-variable))) |
| 1042 | (if (and variable (string-match "^\\$" variable)) | 1043 | (if (and variable (string-match "^\\$" variable)) |
| 1043 | (prog2 (message "Completing variable name...") | 1044 | (prog2 (unless (window-minibuffer-p (selected-window)) |
| 1045 | (message "Completing variable name...")) | ||
| 1044 | (shell-dynamic-complete-as-environment-variable))))) | 1046 | (shell-dynamic-complete-as-environment-variable))))) |
| 1045 | 1047 | ||
| 1046 | 1048 | ||