Backport fixes for Bug#5390 and Bug#5694 from trunk.

* progmodes/python.el: Add Ipython support (Bug#5390).
(python-shell-prompt-alist)
(python-shell-continuation-prompt-alist): New options.
(python--set-prompt-regexp): New function.
(inferior-python-mode, run-python, python-shell): Require
ansi-color.  Use python--set-prompt-regexp to set the comint
prompt based on the Python interpreter.
(python--prompt-regexp): New var.
(python-check-comint-prompt)
(python-comint-output-filter-function): Use it.
(run-python): Use a pipe (Bug#5694).

1 files changed, 14 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4796239b366..add4b50bfbd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,19 @@
 2010-11-21  Chong Yidong  <cyd@stupidchicken.com>
 
+        * progmodes/python.el: Add Ipython support (Bug#5390).
+        (python-shell-prompt-alist)
+        (python-shell-continuation-prompt-alist): New options.
+        (python--set-prompt-regexp): New function.
+        (inferior-python-mode, run-python, python-shell): Require
+        ansi-color.  Use python--set-prompt-regexp to set the comint
+        prompt based on the Python interpreter.
+        (python--prompt-regexp): New var.
+        (python-check-comint-prompt)
+        (python-comint-output-filter-function): Use it.
+        (run-python): Use a pipe (Bug#5694).
+
+2010-11-21  Chong Yidong  <cyd@stupidchicken.com>
+
         * progmodes/python.el (run-python): Doc fix.
         (python-keep-current-directory-in-path): New var (Bug#7454).