diff lisp/progmodes/python.el @ 111626:3655cc4062e4

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 17 Nov 2010 22:54:14 -0500
parents bd93bfc2fc83 d4d6fcc60f7b
children 946fe738ec2b
line wrap: on
line diff
--- a/lisp/progmodes/python.el	Wed Nov 17 22:02:15 2010 -0500
+++ b/lisp/progmodes/python.el	Wed Nov 17 22:54:14 2010 -0500
@@ -2807,7 +2807,7 @@
 process is started.  If you use this, you will probably want to ensure
 that the current arguments are retained (they will be included in the
 prompt).  This argument is ignored when this function is called
-programmatically, or when running in Emacs 19.34 or older.
+programmatically.
 
 Note: You can toggle between using the CPython interpreter and the
 JPython interpreter by hitting \\[python-toggle-shells].  This toggles