diff options
| author | Jonathan Kyle Mitchell | 2018-05-02 23:09:55 -0500 |
|---|---|---|
| committer | Noam Postavsky | 2018-07-10 21:22:52 -0400 |
| commit | 39489f782e436a490d1bec32d7ed9b7bcdacda24 (patch) | |
| tree | 1ef079667978a751b2e2c909f003cf30e5b68e01 | |
| parent | c249e17324ddbb1ad34b510be3ad6ebd3248ba0c (diff) | |
| download | emacs-39489f782e436a490d1bec32d7ed9b7bcdacda24.tar.gz emacs-39489f782e436a490d1bec32d7ed9b7bcdacda24.zip | |
Fix infinite recursion in eshell/clear (Bug#31326)
* lisp/eshell/esh-mode.el (eshell/clear): Bind
eshell-input-filter-functions to nil to prevent entries like
eshell-smart-display-setup from causing infinite recursion.
| -rw-r--r-- | lisp/eshell/esh-mode.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index bbb74c3d86f..9f854c7d907 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el | |||
| @@ -884,8 +884,7 @@ If SCROLLBACK is non-nil, clear the scrollback contents." | |||
| 884 | (interactive) | 884 | (interactive) |
| 885 | (if scrollback | 885 | (if scrollback |
| 886 | (eshell/clear-scrollback) | 886 | (eshell/clear-scrollback) |
| 887 | (let ((eshell-input-filter-functions | 887 | (let ((eshell-input-filter-functions nil)) |
| 888 | (remq 'eshell-add-to-history eshell-input-filter-functions))) | ||
| 889 | (insert (make-string (window-size) ?\n)) | 888 | (insert (make-string (window-size) ?\n)) |
| 890 | (eshell-send-input)))) | 889 | (eshell-send-input)))) |
| 891 | 890 | ||