diff options
| author | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
| commit | adf2fc4a01efe77d73cd52bc9173914ed56ff531 (patch) | |
| tree | a5a280a5554a7bffeaf94fccae29fa3ac1a5d066 /lisp/shell.el | |
| parent | 63191d9f2043d2e67657e85a7b3842805dd1dad6 (diff) | |
| parent | 38726039b77db432989fed106c88e9f1aa463281 (diff) | |
| download | emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.tar.gz emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index a78ab7f81ab..3ca2564b65c 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -1122,7 +1122,7 @@ Returns t if successful." | |||
| 1122 | (interactive) | 1122 | (interactive) |
| 1123 | (let ((data (shell-command-completion))) | 1123 | (let ((data (shell-command-completion))) |
| 1124 | (if data | 1124 | (if data |
| 1125 | (prog2 (unless (window-minibuffer-p (selected-window)) | 1125 | (prog2 (unless (window-minibuffer-p) |
| 1126 | (message "Completing command name...")) | 1126 | (message "Completing command name...")) |
| 1127 | (apply #'completion-in-region data))))) | 1127 | (apply #'completion-in-region data))))) |
| 1128 | 1128 | ||
| @@ -1232,7 +1232,7 @@ Returns non-nil if successful." | |||
| 1232 | (interactive) | 1232 | (interactive) |
| 1233 | (let ((data (shell-environment-variable-completion))) | 1233 | (let ((data (shell-environment-variable-completion))) |
| 1234 | (if data | 1234 | (if data |
| 1235 | (prog2 (unless (window-minibuffer-p (selected-window)) | 1235 | (prog2 (unless (window-minibuffer-p) |
| 1236 | (message "Completing variable name...")) | 1236 | (message "Completing variable name...")) |
| 1237 | (apply #'completion-in-region data))))) | 1237 | (apply #'completion-in-region data))))) |
| 1238 | 1238 | ||