(py-mode-map): Removed special bindings for C-m and C-j to

py-newline-and-indent.  These ought to get picked up by the mapcar
that follows; any existing binding to newline-and-indent gets shadowed
to py-newline-and-indent.

This will break some people who, e.g. bind C-m or C-j to newline but
still want these bound to py-newline-and-indent in Python mode.  On
the other hand, the forced binding pisses off Emacs diehards.  So
consider this experimental and see if any tall Dutch guys complain :-)

diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 0bdcfa13cb4060a37dd6a03725fe3cae00d67a12..9004a969184f7e8daa57bfde1c6eddcad5f99b39 100644 (file)
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -483,9 +483,6 @@ Currently-active file is at the head of the list.")
   ;; information
   (define-key py-mode-map "\C-c\C-b" 'py-submit-bug-report)
   (define-key py-mode-map "\C-c\C-v" 'py-version)
-  ;; py-newline-and-indent mappings
-  (define-key py-mode-map "\n"   'py-newline-and-indent)
-  (define-key py-mode-map "\C-m" 'py-newline-and-indent)
   ;; shadow global bindings for newline-and-indent w/ the py- version.
   ;; BAW - this is extremely bad form, but I'm not going to change it
   ;; for now.