[Emacs-diffs] /srv/bzr/emacs/trunk r105647: * progmodes/python.el (python-mode-map): Use correct function to

[Christoph Scholtes]

------------------------------------------------------------
revno: 105647
committer: Christoph Scholtes <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-03 12:44:37 -0600
message:
  * progmodes/python.el (python-mode-map): Use correct function to
  start python interpreter from menu-bar (as reported by Geert
  Kloosterman).
  (inferior-python-mode-map): Fix typo.
  (python-shell-map): Removed.
modified:
  lisp/ChangeLog
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-03 17:40:08 +0000
+++ b/lisp/ChangeLog    2011-09-03 18:44:37 +0000
@@ -1,3 +1,11 @@
+2011-09-03  Christoph Scholtes  <address@hidden>
+
+       * progmodes/python.el (python-mode-map): Use correct function to
+       start python interpreter from menu-bar (as reported by Geert
+       Kloosterman).
+       (inferior-python-mode-map): Fix typo.
+       (python-shell-map): Removed.
+
 2011-09-03  Deniz Dogan  <address@hidden>
 
        * net/rcirc.el (rcirc-print): Simplify code for

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2011-06-25 18:21:00 +0000
+++ b/lisp/progmodes/python.el  2011-09-03 18:44:37 +0000
@@ -296,7 +296,7 @@
         :filter (lambda (&rest junk)
                    (abbrev-table-menu python-mode-abbrev-table)))
        "-"
-       ["Start interpreter" python-shell
+       ["Start interpreter" run-python
         :help "Run `inferior' Python in separate buffer"]
        ["Import/reload file" python-load-file
         :help "Load into inferior Python session"]
@@ -328,14 +328,6 @@
 ;; eric has items including: (un)indent, (un)comment, restart script,
 ;; run script, debug script; also things for profiling, unit testing.
 
-(defvar python-shell-map
-  (let ((map (copy-keymap comint-mode-map)))
-    (define-key map [tab]   'tab-to-tab-stop)
-    (define-key map "\C-c-" 'py-up-exception)
-    (define-key map "\C-c=" 'py-down-exception)
-    map)
-  "Keymap used in *Python* shell buffers.")
-
 (defvar python-mode-syntax-table
   (let ((table (make-syntax-table)))
     ;; Give punctuation syntax to ASCII that normally has symbol
@@ -1345,7 +1337,7 @@
     (define-key map "\C-c\C-l" 'python-load-file)
     (define-key map "\C-c\C-v" 'python-check)
     ;; Note that we _can_ still use these commands which send to the
-    ;; Python process even at the prompt iff we have a normal prompt,
+    ;; Python process even at the prompt if we have a normal prompt,
     ;; i.e. '>>> ' and not '... '.  See the comment before
     ;; python-send-region.  Fixme: uncomment these if we address that.