- applied Nicolas Pernetty's patch to improve support for (X)Emacs under Win32.

- update docs to include mention of Qt4 support (it has been there for a
  long time, but no documentation mentioned it).

IPython/ColorANSI.py

@@ -1,7 +1,7 b''
 # -*- coding: utf-8 -*-
 """Tools for coloring text in ANSI terminals.
 
-$Id: ColorANSI.py 1005 2006-01-12 08:39:26Z fperez $"""
+$Id: ColorANSI.py 2152 2007-03-18 20:13:35Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2002-2006 Fernando Perez. <[e-mail]>
@@ -79,8 +79,14 b' class InputTermColors:'
     This class should be used as a mixin for building color schemes."""
     
     NoColor = ''  # for color schemes in color-less terminals.
-    Normal = '\001\033[0m\002'   # Reset normal coloring
-    _base  = '\001\033[%sm\002'  # Template for all other colors
+
+    if os.name == 'nt' and os.environ.get('TERM','dumb') != 'emacs':
+        # (X)emacs on W32 gets confused with \001 and \002 so we remove them
+        Normal = '\033[0m'   # Reset normal coloring
+        _base  = '\033[%sm'  # Template for all other colors
+    else:
+        Normal = '\001\033[0m\002'   # Reset normal coloring
+        _base  = '\001\033[%sm\002'  # Template for all other colors
 
 # Build the actual color table as a set of class attributes:
 make_color_table(InputTermColors)

IPython/genutils.py

@@ -5,7 +5,7 b' General purpose utilities.'
 This is a grab-bag of stuff I find useful in most programs I write. Some of
 these things are also convenient when working at the command line.
 
-$Id: genutils.py 2108 2007-02-23 00:31:17Z fperez $"""
+$Id: genutils.py 2152 2007-03-18 20:13:35Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez. <[e-mail]>
@@ -1247,7 +1247,8 b' def get_pager_start(pager,start):'
     return start_string
 
 #----------------------------------------------------------------------------
-if os.name == "nt":
+# (X)emacs on W32 doesn't like to be bypassed with msvcrt.getch()
+if os.name == 'nt' and os.environ.get('TERM','dumb') != 'emacs':
     import msvcrt
     def page_more():
         """ Smart pausing between pages

IPython/usage.py

@@ -6,7 +6,7 b''
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
-# $Id: usage.py 2010 2006-12-20 15:29:17Z vivainio $
+# $Id: usage.py 2152 2007-03-18 20:13:35Z fperez $
 
 from IPython import Release
 __author__  = '%s <%s>' % Release.authors['Fernando']
@@ -53,19 +53,19 b' SPECIAL THREADING OPTIONS'
        ization of ipython itself, before the normal option-handling  mechanism
        is active.
 
-       -gthread, -qthread, -wthread, -pylab
+       -gthread, -qthread, -q4thread, -wthread, -pylab
 
               Only ONE of these can be given, and it can only be given as the
               first option passed to IPython (it will have no effect in any
               other position).  They provide threading support for the GTK, QT
               and WXWidgets toolkits, and for the matplotlib library.
 
-              With any of the first three options, IPython starts running a
+              With any of the first four options, IPython starts running a
               separate thread for the graphical toolkit's operation, so that
               you can open and control graphical elements from within an
-              IPython command line, without blocking.  All three provide
-              essentially the same functionality, respectively for GTK, QT and
-              WXWidgets (via their Python interfaces).
+              IPython command line, without blocking.  All four provide
+              essentially the same functionality, respectively for GTK, QT3,
+              QT4 and WXWidgets (via their Python interfaces).
 
               Note that with -wthread, you can additionally use the -wxversion
               option to request a specific version of wx to be used.  This
@@ -81,14 +81,14 b' SPECIAL THREADING OPTIONS'
               execute (without blocking) any matplotlib-based script which
               calls show() at the end.
 
-       -tk    The -g/q/wthread options, and -pylab (if matplotlib is
+       -tk    The -g/q/q4/wthread options, and -pylab (if matplotlib is
               configured to use GTK, QT or WX), will normally block Tk
               graphical interfaces.  This means that when GTK, QT or WX
               threading is active, any attempt to open a Tk GUI will result in
               a dead window, and possibly cause the Python interpreter to
               crash.  An extra option, -tk, is available to address this
               issue.  It can ONLY be given as a SECOND option after any of the
-              above (-gthread, -qthread, -wthread or -pylab).
+              above (-gthread, -qthread, q4thread, -wthread or -pylab).
 
               If -tk is given, IPython will try to coordinate Tk threading
               with GTK, QT or WX.  This is however potentially unreliable, and

doc/ChangeLog

@@ -1,3 +1,8 b''
[phone]  Fernando Perez  <[e-mail]>
+
+	* IPython/ColorANSI.py (InputTermColors.Normal): applied Nicolas
+	Pernetty's patch to improve support for (X)Emacs under Win32.
+
 2007-03-17  Fernando Perez  <[e-mail]>
 
 	* IPython/Shell.py (hijack_wx): ipmort WX with current semantics

doc/ipython.1

@@ -36,18 +36,18 b' The following special options are ONLY valid at the beginning of the command'
 line, and not later.  This is because they control the initialization of
 ipython itself, before the normal option-handling mechanism is active.
 .TP
-.B \-gthread, \-qthread, \-wthread, \-pylab
+.B \-gthread, \-qthread, \-q4thread, \-wthread, \-pylab
 Only ONE of these can be given, and it can only be given as the first option
-passed to IPython (it will have no effect in any other position).  They
-provide threading support for the GTK, QT and WXWidgets toolkits, and for the
+passed to IPython (it will have no effect in any other position).  They provide
+threading support for the GTK, QT3, QT4 and WXWidgets toolkits, and for the
 matplotlib library.
 .br
 .sp 1
-With any of the first three options, IPython starts running a separate thread
+With any of the first four options, IPython starts running a separate thread
 for the graphical toolkit's operation, so that you can open and control
 graphical elements from within an IPython command line, without blocking.  All
-three provide essentially the same functionality, respectively for GTK, QT and
-WXWidgets (via their Python interfaces).
+four provide essentially the same functionality, respectively for GTK, QT3, QT4
+and WXWidgets (via their Python interfaces).
 .br
 .sp 1
 Note that with \-wthread, you can additionally use the \-wxversion option to
@@ -64,7 +64,7 b' backend requires it. It also modifies the %run command to correctly execute'
 (without blocking) any matplotlib-based script which calls show() at the end.
 .TP
 .B \-tk
-The \-g/q/wthread options, and \-pylab (if matplotlib is configured to use
+The \-g/q/q4/wthread options, and \-pylab (if matplotlib is configured to use
 GTK, QT or WX), will normally block Tk graphical interfaces.  This means that
 when GTK, QT or WX threading is active, any attempt to open a Tk GUI will
 result in a dead window, and possibly cause the Python interpreter to crash.

win32_manual_post_install.py

@@ -88,6 +88,11 b' def run(wait=0):'
     # make shortcuts for IPython, html and pdf docs.
     print 'Making entries for IPython in Start Menu...',
 
+    # Create .bat file in \\Scripts
+    fic = open(sys.prefix + '\\Scripts\\ipython.bat','w')
+    fic.write('"' + sys.prefix + '\\python.exe' + '" -i ' + '"' + sys.prefix + '\\Scripts\ipython" %*')
+    fic.close()
+
     # Create shortcuts in Programs\IPython:
     if not os.path.isdir(ip_prog_dir):
         os.mkdir(ip_prog_dir)