2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8332a701a8..5eac93fa444 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-19  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/python.el (python-mode): Derive from prog-mode.
+
 2012-06-19  Kevin Gallagher  <Kevin.Gallagher@boeing.com>
 
         * emulation/edt.el (edt-default-menu-bar-update-buffers)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 8844480a95f..a43dc1eb1d3 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2802,7 +2802,7 @@ Optional argument DIRECTION defines the direction to move to."
 
 
 ;;;###autoload
-(define-derived-mode python-mode fundamental-mode "Python"
+(define-derived-mode python-mode prog-mode "Python"
   "Major mode for editing Python files.
 
 \\{python-mode-map}