Consistent completion in inferior python with emacs -nw.

* progmodes/python.el (inferior-python-mode): replace "<tab>"
binding in inferior-python-mode-map with "\t".
(python-shell-completion-complete-at-point)
(python-completion-complete-at-point): Remove interactive spec.

2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bd1056f560..33d59c200c1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-27  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        Consistent completion in inferior python with emacs -nw.
+        * progmodes/python.el (inferior-python-mode): replace "<tab>"
+        binding in inferior-python-mode-map with "\t".
+        (python-shell-completion-complete-at-point)
+        (python-completion-complete-at-point): Remove interactive spec.
+
 2012-07-27  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc/calccomp.el (math-compose-expr): Undo previous change.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index ab364a5318a..4617ecc420d 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1545,7 +1545,7 @@ variable.
             'python-shell-completion-complete-at-point nil 'local)
   (add-to-list (make-local-variable 'comint-dynamic-complete-functions)
                'python-shell-completion-complete-at-point)
-  (define-key inferior-python-mode-map (kbd "<tab>")
+  (define-key inferior-python-mode-map "\t"
     'python-shell-completion-complete-or-indent)
   (when python-shell-enable-font-lock
     (set (make-local-variable 'font-lock-defaults)
@@ -1948,7 +1948,6 @@ completions on the current context."
 
 (defun python-shell-completion-complete-at-point ()
   "Perform completion at point in inferior Python process."
-  (interactive)
   (and comint-last-prompt-overlay
        (> (point-marker) (overlay-end comint-last-prompt-overlay))
        (python-shell-completion--do-completion-at-point
@@ -2063,7 +2062,6 @@ Argument OUTPUT is a string with the output from the comint process."
 For this to work the best as possible you should call
 `python-shell-send-buffer' from time to time so context in
 inferior python process is updated properly."
-  (interactive)
   (let ((process (python-shell-get-process)))
     (if (not process)
         (error "Completion needs an inferior Python process running")