diff options
| author | Nickolas Lloyd | 2017-02-01 22:31:55 -0500 |
|---|---|---|
| committer | Nickolas Lloyd | 2017-02-01 22:31:55 -0500 |
| commit | 9a15b5509abb49a11c97c1101ad216f4ef258368 (patch) | |
| tree | 7311337d92833cb8f233eaa696a967a15a306a80 /lisp/shell.el | |
| parent | 5d8f2548ceaa5a0b33c08a39f1d6c11071ec63aa (diff) | |
| parent | 70d36dda26465b43c1a63e8e13153e070af86456 (diff) | |
| download | emacs-nick.lloyd-bytecode-jit.tar.gz emacs-nick.lloyd-bytecode-jit.zip | |
Merge branch 'master' into nick.lloyd-bytecode-jitnick.lloyd-bytecode-jit
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index c7ba64ecf4e..c8a8555d632 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -1000,8 +1000,6 @@ command again." | |||
| 1000 | (let ((pt (point)) | 1000 | (let ((pt (point)) |
| 1001 | (regexp | 1001 | (regexp |
| 1002 | (concat | 1002 | (concat |
| 1003 | ;; comint-process-echoes is the thing that breaks the | ||
| 1004 | ;; throbber | ||
| 1005 | (if comint-process-echoes | 1003 | (if comint-process-echoes |
| 1006 | ;; Skip command echo if the process echoes | 1004 | ;; Skip command echo if the process echoes |
| 1007 | (concat "\\(" (regexp-quote shell-dirstack-query) "\n\\)") | 1005 | (concat "\\(" (regexp-quote shell-dirstack-query) "\n\\)") |