From cf100f60a6fbed0446dbc091649df4f17e4f5694 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Sun, 16 Nov 2014 11:11:49 -0300 Subject: [PATCH] Prevent resizing the echo area when iPython is enabled Fixes: debbugs:18794 * lisp/progmodes/python.el (python-eldoc--get-doc-at-point): Strip shell output before returning. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/python.el | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 442b8f69e59..d47a97f73ec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-16 Fabián Ezequiel Gallina + + * progmodes/python.el (python-eldoc--get-doc-at-point): Strip + shell output before returning. (bug#18794) + 2014-11-16 Dmitry Gutov Fix indentation before `!=' and after `+='. Originally reported diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 89b2f1fd081..5a5a039afc9 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -3408,9 +3408,12 @@ returns will be used. If not FORCE-PROCESS is passed what (let ((input (or force-input (python-info-current-symbol t)))) (and input - (python-shell-send-string-no-output - (format python-eldoc-string-code input) - process)))))) + ;; Prevent resizing the echo area when iPython is + ;; enabled. Bug#18794. + (python-util-strip-string + (python-shell-send-string-no-output + (format python-eldoc-string-code input) + process))))))) (defun python-eldoc-function () "`eldoc-documentation-function' for Python. -- 2.39.5