* lisp/progmodes/python.el (inferior-python-mode): Use add-hook.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6680722dd4f91fd1b6751e94bf5d9a3eb39a0704..9e1ffa7ba20e289d212c1783af1f90880854f0fd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/python.el (inferior-python-mode): Use add-hook.
+
        * Makefile.in (AUTOGEN_VCS): Remove emulation/tpu-edt.el.
 
 2014-10-20  Glenn Morris  <rgm@gnu.org>

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a564acc3075eebd3f6ba4bfd4c6709530f74aa23..c828de10304432425dd7a06d000c33ea7ea14496 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2165,9 +2165,9 @@ variable.
   (define-key inferior-python-mode-map [remap complete-symbol]
     'completion-at-point)
   (add-hook 'completion-at-point-functions
-            'python-shell-completion-complete-at-point nil 'local)
-  (add-to-list (make-local-variable 'comint-dynamic-complete-functions)
-               'python-shell-completion-complete-at-point)
+            #'python-shell-completion-complete-at-point nil 'local)
+  (add-hook 'comint-dynamic-complete-functions ;FIXME: really?
+            #'python-shell-completion-complete-at-point nil 'local)
   (define-key inferior-python-mode-map "\t"
     'python-shell-completion-complete-or-indent)
   (make-local-variable 'python-pdbtrack-buffers-to-kill)