]> git.eshelyaron.com Git - emacs.git/commitdiff
Prevent resizing the echo area when iPython is enabled
authorFabián Ezequiel Gallina <galli.87@gmail.com>
Sun, 16 Nov 2014 14:11:49 +0000 (11:11 -0300)
committerFabián Ezequiel Gallina <galli.87@gmail.com>
Sun, 16 Nov 2014 14:11:49 +0000 (11:11 -0300)
Fixes: debbugs:18794
* lisp/progmodes/python.el (python-eldoc--get-doc-at-point): Strip
shell output before returning.

lisp/ChangeLog
lisp/progmodes/python.el

index 442b8f69e59297890dabf4d352480f036765bce5..d47a97f73ec01dfa8ff1fa59f29ae4d4c29116e8 100644 (file)
@@ -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
index 89b2f1fd08180bb11876ef806c461ee28ff41d71..5a5a039afc993e8d9a9c0ecabf636b1cae151c28 100644 (file)
@@ -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.