From: Christoph Scholtes Date: Sat, 3 Sep 2011 18:44:37 +0000 (-0600) Subject: * progmodes/python.el (python-mode-map): Use correct function to X-Git-Tag: emacs-pretest-24.0.90~104^2~155^2~4 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=464cdf568e3dd67373afa67c56dc763240eac083;p=emacs.git * 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. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 656bf8485e9..3c27b51dfdf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2011-09-03 Christoph Scholtes + + * 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 * net/rcirc.el (rcirc-print): Simplify code for diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 4d2f15c69d8..3f923f496b9 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -296,7 +296,7 @@ Used for syntactic keywords. N is the match number (1, 2 or 3)." :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 @@ Used for syntactic keywords. N is the match number (1, 2 or 3)." ;; 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 @@ local value.") (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.