From ab6728787245e0d46bd8a8919e30c882f6011182 Mon Sep 17 00:00:00 2001 From: memeplex Date: Mon, 14 Oct 2019 21:37:20 -0300 Subject: [PATCH] Avoid extra lines in python-shell font lock buffer (Bug#33959) * lisp/progmodes/python.el (python-shell-font-lock-comint-output-filter-function): Avoid writing a newline to the font lock buffer when receiving an empty string. --- lisp/progmodes/python.el | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index b168b62c291..634c297957d 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2600,18 +2600,19 @@ goes wrong and syntax highlighting in the shell gets messed up." (defun python-shell-font-lock-comint-output-filter-function (output) "Clean up the font-lock buffer after any OUTPUT." - (if (let ((output (ansi-color-filter-apply output))) - (and (python-shell-comint-end-of-output-p output) - ;; Assume "..." represents a continuation prompt. - (not (string-match "\\.\\.\\." output)))) - ;; If output ends with an initial (not continuation) input prompt - ;; then the font-lock buffer must be cleaned up. - (python-shell-font-lock-cleanup-buffer) - ;; Otherwise just add a newline. - (python-shell-font-lock-with-font-lock-buffer - (goto-char (point-max)) - (newline))) - output) + (unless (string= output "") ;; See Bug#33959. + (if (let ((output (ansi-color-filter-apply output))) + (and (python-shell-comint-end-of-output-p output) + ;; Assume "..." represents a continuation prompt. + (not (string-match "\\.\\.\\." output)))) + ;; If output ends with an initial (not continuation) input prompt + ;; then the font-lock buffer must be cleaned up. + (python-shell-font-lock-cleanup-buffer) + ;; Otherwise just add a newline. + (python-shell-font-lock-with-font-lock-buffer + (goto-char (point-max)) + (newline))) + output)) (defun python-shell-font-lock-post-command-hook () "Fontifies current line in shell buffer." -- 2.39.2