Mercurial > emacs
comparison lisp/comint.el @ 109793:b60dcdd855f0
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 08 Aug 2010 22:52:25 +0000 |
| parents | 8865dff431b0 |
| children | 280c8ae2476d |
comparison
equal
deleted
inserted
replaced
| 109649:1f8f03cfcd2b | 109793:b60dcdd855f0 |
|---|---|
| 672 (add-hook 'pre-command-hook 'comint-preinput-scroll-to-bottom t t) | 672 (add-hook 'pre-command-hook 'comint-preinput-scroll-to-bottom t t) |
| 673 (make-local-variable 'comint-ptyp) | 673 (make-local-variable 'comint-ptyp) |
| 674 (make-local-variable 'comint-process-echoes) | 674 (make-local-variable 'comint-process-echoes) |
| 675 (make-local-variable 'comint-file-name-chars) | 675 (make-local-variable 'comint-file-name-chars) |
| 676 (make-local-variable 'comint-file-name-quote-list) | 676 (make-local-variable 'comint-file-name-quote-list) |
| 677 ;; dir tracking on remote files | |
| 678 (set (make-local-variable 'comint-file-name-prefix) | |
| 679 (or (file-remote-p default-directory) "")) | |
| 677 (make-local-variable 'comint-accum-marker) | 680 (make-local-variable 'comint-accum-marker) |
| 678 (setq comint-accum-marker (make-marker)) | 681 (setq comint-accum-marker (make-marker)) |
| 679 (make-local-variable 'font-lock-defaults) | 682 (make-local-variable 'font-lock-defaults) |
| 680 (setq font-lock-defaults '(nil t)) | 683 (setq font-lock-defaults '(nil t)) |
| 681 (add-hook 'change-major-mode-hook 'font-lock-defontify nil t) | 684 (add-hook 'change-major-mode-hook 'font-lock-defontify nil t) |