[Emacs-diffs] [emacs] 01/01: Prevent resizing the echo area when iPython is enabled

[Fabián Ezequiel Gallina]

fgallina pushed a commit to branch emacs-24
in repository emacs.

commit cf100f60a6fbed0446dbc091649df4f17e4f5694
Author: Fabián Ezequiel Gallina <address@hidden>
Date:   Sun Nov 16 11:11:49 2014 -0300

    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 442b8f6..d47a97f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-16  Fabián Ezequiel Gallina  <address@hidden>
+
+       * progmodes/python.el (python-eldoc--get-doc-at-point): Strip
+       shell output before returning.  (bug#18794)
+
 2014-11-16  Dmitry Gutov  <address@hidden>
 
        Fix indentation before `!=' and after `+='.  Originally reported
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 89b2f1f..5a5a039 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.