diff options
| author | Fabián Ezequiel Gallina <galli.87@gmail.com> | 2014-11-16 11:11:49 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina <galli.87@gmail.com> | 2014-11-16 11:11:49 -0300 |
| commit | cf100f60a6fbed0446dbc091649df4f17e4f5694 (patch) | |
| tree | 063c2c185fceb17b2ae0762eeb2e3f08ead7b468 | |
| parent | c613f4d6c12ad7a8ebbc88dcef48949c6a775996 (diff) | |
| download | emacs-cf100f60a6fbed0446dbc091649df4f17e4f5694.tar.gz emacs-cf100f60a6fbed0446dbc091649df4f17e4f5694.tar.bz2 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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <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. |