diff --git a/IPython/hooks.py b/IPython/hooks.py
index 28f68cf..45e0ef9 100644
--- a/IPython/hooks.py
+++ b/IPython/hooks.py
@@ -32,7 +32,7 @@ ip.set_hook('editor', calljed)
 You can then enable the functionality by doing 'import myiphooks'
 somewhere in your configuration files or ipython command line.
 
-$Id: hooks.py 1107 2006-01-30 19:02:20Z vivainio $"""
+$Id: hooks.py 1156 2006-02-12 02:30:36Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2005 Fernando Perez. <fperez@colorado.edu>
@@ -73,7 +73,7 @@ def editor(self,filename, linenum=None):
     else:
         linemark = '+%d' % linenum
     # Call the actual editor
-    os.system('%s %s %s' % (editor,linemark,filename))
+    os.system('"%s" %s %s' % (editor,linemark,filename))
 
 import tempfile
 def fix_error_editor(self,filename,linenum,column,msg):
@@ -181,4 +181,4 @@ def late_startup_hook(self):
     """ Executed after ipython has been constructed and configured 
     
     """
-    #print "default startup hook ok" # dbg
\ No newline at end of file
+    #print "default startup hook ok" # dbg
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7b245c5..0f85ca6 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,10 @@
 2006-02-11  Fernando Perez  <Fernando.Perez@colorado.edu>
 
+	* IPython/hooks.py (editor): quote the call to the editor command,
+	to allow commands with spaces in them.  Problem noted by watching
+	Ian Oswald's video about textpad under win32 at
+	http://showmedo.com/videoListPage?listKey=PythonIPythonSeries
+
 	* IPython/UserConfig/ipythonrc: Replace @ signs with % when
 	describing magics (we haven't used @ for a loong time).