summaryrefslogtreecommitdiff
path: root/lisp/shell.el
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2008-03-21 23:52:27 +0000
committerJuri Linkov <juri@jurta.org>2008-03-21 23:52:27 +0000
commitc35be7ec907278bf13968530b2c091fd91a93eba (patch)
tree26fbd6b8e727e7043bcfdb783b37c785fad86904 /lisp/shell.el
parent4b0dc1de40c1cc113f1f508be94a7f6a24cd1fcf (diff)
downloademacs-c35be7ec907278bf13968530b2c091fd91a93eba.tar.gz
emacs-c35be7ec907278bf13968530b2c091fd91a93eba.tar.bz2
emacs-c35be7ec907278bf13968530b2c091fd91a93eba.zip
(shell-dynamic-complete-command)
(shell-dynamic-complete-environment-variable): Don't display completion messages when command is called in the minibuffer.
Diffstat (limited to 'lisp/shell.el')
-rw-r--r--lisp/shell.el6
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."
(save-match-data (not (string-match "[~/]" filename)))
(eq (match-beginning 0)
(save-excursion (shell-backward-command 1) (point))))
- (prog2 (message "Completing command name...")
+ (prog2 (unless (window-minibuffer-p (selected-window))
+ (message "Completing command name..."))
(shell-dynamic-complete-as-command)))))
@@ -1040,7 +1041,8 @@ Returns non-nil if successful."
(interactive)
(let ((variable (shell-match-partial-variable)))
(if (and variable (string-match "^\\$" variable))
- (prog2 (message "Completing variable name...")
+ (prog2 (unless (window-minibuffer-p (selected-window))
+ (message "Completing variable name..."))
(shell-dynamic-complete-as-environment-variable)))))