(python-mode): Don't mess with hippie-expand.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75702835987da7039bdfece97e5cb5768c079c16..b0b66d05b77cbba9d2ff319be81c2d83e74a3909 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/python.el (python-mode): Don't mess with hippie-expand.
+
 2008-04-11  Chong Yidong  <cyd@stupidchicken.com>
 
        * woman.el (woman2-TH): Use string-equal instead of string-match.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index ae863df3b5dc366b792b75245069b74fb1c32e84..19e9373a5ec0899b7751db8d1d07b79ca1030699 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2291,9 +2291,11 @@ with skeleton expansions for compound statement templates.
                                                 (current-column))))
         (^ '(- (1+ (current-indentation))))))
   (add-hook 'pre-abbrev-expand-hook 'python-pea-hook nil t)
-  (if (featurep 'hippie-exp)
-      (set (make-local-variable 'hippie-expand-try-functions-list)
-          (cons 'python-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 'python-try-complete hippie-expand-try-functions-list)))
   ;; Python defines TABs as being 8-char wide.
   (set (make-local-variable 'tab-width) 8)
   (when python-guess-indent (python-guess-indent))