# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1224997854 0
# Node ID 9f4cc3f732861b54e68c60cd2e7b568c959f2ed3
# Parent  b7eb74a4d86b3d93b3961604569ff0735add799f
(python-mode): Don't impose ourselves on hippie.

diff -r b7eb74a4d86b -r 9f4cc3f73286 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Oct 26 04:32:09 2008 +0000
+++ b/lisp/ChangeLog	Sun Oct 26 05:10:54 2008 +0000
@@ -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 -r b7eb74a4d86b -r 9f4cc3f73286 lisp/progmodes/python.el
--- a/lisp/progmodes/python.el	Sun Oct 26 04:32:09 2008 +0000
+++ b/lisp/progmodes/python.el	Sun Oct 26 05:10:54 2008 +0000
@@ -2473,10 +2473,12 @@
        '((< '(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))