diff options
| author | Alan Mackenzie <acm@muc.de> | 2017-02-12 10:59:03 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2017-02-12 10:59:03 +0000 |
| commit | f4d5b687150810129b7a1d5b006e31ccf82b691b (patch) | |
| tree | 4229b13800349032697daae3904dc3773e6b7a80 /lisp/shell.el | |
| parent | d5514332d4a6092673ce1f78fadcae0c57f7be64 (diff) | |
| parent | 148100d98319499f0ac6f57b8be08cbd14884a5c (diff) | |
| download | emacs-comment-cache.tar.gz | |
Merge branch 'master' into comment-cachecomment-cache
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 133771aeb32..c8a8555d632 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -544,11 +544,14 @@ control whether input and output cause the window to scroll to the end of the buffer." (setq comint-prompt-regexp shell-prompt-pattern) (shell-completion-vars) - (set (make-local-variable 'paragraph-separate) "\\'") - (set (make-local-variable 'paragraph-start) comint-prompt-regexp) - (set (make-local-variable 'font-lock-defaults) '(shell-font-lock-keywords t)) - (set (make-local-variable 'shell-dirstack) nil) - (set (make-local-variable 'shell-last-dir) nil) + (setq-local paragraph-separate "\\'") + (setq-local paragraph-start comint-prompt-regexp) + (setq-local font-lock-defaults '(shell-font-lock-keywords t)) + (setq-local shell-dirstack nil) + (setq-local shell-last-dir nil) + ;; People expect Shell mode to keep the last line of output at + ;; window bottom. + (setq-local scroll-conservatively 101) (shell-dirtrack-mode 1) ;; By default, ansi-color applies faces using overlays. This is |