From: Fabián Ezequiel Gallina <galli.87@gmail.com>
Date: Sun, 16 Nov 2014 14:11:49 +0000 (-0300)
Subject: Prevent resizing the echo area when iPython is enabled
X-Git-Tag: emacs-24.4.90~205
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf100f60a6fbed0446dbc091649df4f17e4f5694;p=emacs.git

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.
---

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  <fgallina@gnu.org>
+
+	* progmodes/python.el (python-eldoc--get-doc-at-point): Strip
+	shell output before returning.  (bug#18794)
+
 2014-11-16  Dmitry Gutov  <dgutov@yandex.ru>
 
 	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.