summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-10-20 18:37:04 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-10-20 18:37:04 -0400
commitc9f7e33c60b95981367187d0419b50a8d4024ff4 (patch)
treec6dc2bbc5077fa5a08f42ac10acffba0cfe66f01 /lisp
parent3b1f2e09998262fb103c9d2dee3383746977d1d1 (diff)
downloademacs-c9f7e33c60b95981367187d0419b50a8d4024ff4.tar.gz
* lisp/progmodes/python.el (inferior-python-mode): Use add-hook.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/python.el6
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6680722dd4f..9e1ffa7ba20 100644
--- 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 a564acc3075..c828de10304 100644
--- 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)