aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina2014-11-16 11:11:49 -0300
committerFabián Ezequiel Gallina2014-11-16 11:11:49 -0300
commitcf100f60a6fbed0446dbc091649df4f17e4f5694 (patch)
tree063c2c185fceb17b2ae0762eeb2e3f08ead7b468 /lisp/progmodes/python.el
parentc613f4d6c12ad7a8ebbc88dcef48949c6a775996 (diff)
downloademacs-cf100f60a6fbed0446dbc091649df4f17e4f5694.tar.gz
emacs-cf100f60a6fbed0446dbc091649df4f17e4f5694.zip
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.
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el9
1 files changed, 6 insertions, 3 deletions
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
3408 (let ((input (or force-input 3408 (let ((input (or force-input
3409 (python-info-current-symbol t)))) 3409 (python-info-current-symbol t))))
3410 (and input 3410 (and input
3411 (python-shell-send-string-no-output 3411 ;; Prevent resizing the echo area when iPython is
3412 (format python-eldoc-string-code input) 3412 ;; enabled. Bug#18794.
3413 process)))))) 3413 (python-util-strip-string
3414 (python-shell-send-string-no-output
3415 (format python-eldoc-string-code input)
3416 process)))))))
3414 3417
3415(defun python-eldoc-function () 3418(defun python-eldoc-function ()
3416 "`eldoc-documentation-function' for Python. 3419 "`eldoc-documentation-function' for Python.