(python-mode): Don't impose ourselves on hippie.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8abb20b481be11571dd9f7fa755aa19f27666dfe..5c74b7763d051e21f8edc3c8f25affa7a5ce2d3f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/python.el (python-mode): Don't impose ourselves on hippie.
+
        * faces.el (face-font-family-alternatives): Add "CMU Typewriter Text"
        to the courier family.
        * textmodes/tex-mode.el (tex-verbatim): Don't use "monospace" which is

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 5fbd617be1010d1c48a5ae704b5363c9e7c3bd67..3e8cefe6a4772ce72d2af3eaa9c9c94f91f52e75 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2473,10 +2473,12 @@ with skeleton expansions for compound statement templates.
        '((< '(backward-delete-char-untabify (min python-indent
                                                 (current-column))))
         (^ '(- (1+ (current-indentation))))))
-  (if (featurep 'hippie-exp)
-      (set (make-local-variable 'hippie-expand-try-functions-list)
-          (cons 'symbol-completion-try-complete
-                hippie-expand-try-functions-list)))
+  ;; Let's not mess with hippie-expand.  Symbol-completion should rather be
+  ;; bound to another key, since it has different performance requirements.
+  ;; (if (featurep 'hippie-exp)
+  ;;     (set (make-local-variable 'hippie-expand-try-functions-list)
+  ;;          (cons 'symbol-completion-try-complete
+  ;;            hippie-expand-try-functions-list)))
   ;; Python defines TABs as being 8-char wide.
   (set (make-local-variable 'tab-width) 8)
   (unless font-lock-mode (font-lock-mode 1))