Merge branch 'emacs-24'

Conflicts:
	nt/addsection.c
	nt/inc/ms-w32.h
	src/w32.c

1 files changed, 6 insertions, 3 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3e204a92cd3..9680a4aa9d5 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3615,9 +3615,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.