diff --git a/etc/NEWS b/etc/NEWS index 5e312ed..5bb84e1 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -610,6 +610,7 @@ command line's password prompt. ** Eshell *** The new built-in command `clear' can scroll window contents out of sight. +If provided with an optional non-nil argument, the scrollback contents will be cleared. ** Browse-url diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 15120cb..54e52b9 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -871,12 +871,20 @@ When run interactively, widen the buffer first." (goto-char (point-max)) (recenter -1)) -(defun eshell/clear () - "Scroll contents of eshell window out of sight, leaving a blank window." +(defun eshell/clear (&optional scrollback) + "Scroll contents of eshell window out of sight, leaving a blank window. +If SCROLLBACK is non-nil, clear the scollback contents." (interactive) - (let ((number-newlines (count-lines (window-start) (point)))) - (insert (make-string number-newlines ?\n))) - (eshell-send-input)) + (if scrollback + (eshell/clear-scrollback) + (let ((number-newlines (count-lines (window-start) (point)))) + (insert (make-string number-newlines ?\n)) + (eshell-send-input)))) + +(defun eshell/clear-scrollback () + "Clear the scrollback content of the eshell window." + (let ((inhibit-read-only t)) + (erase-buffer))) (defun eshell-get-old-input (&optional use-current-region) "Return the command input on the current line."