[Emacs-diffs] Changes to emacs/lisp/progmodes/python.el, v [EMACS_22_BASE]

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        08/04/11 17:51:01

Index: progmodes/python.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/python.el,v
retrieving revision 1.58.2.12
retrieving revision 1.58.2.13
diff -u -b -r1.58.2.12 -r1.58.2.13
--- progmodes/python.el 20 Jan 2008 04:00:43 -0000      1.58.2.12
+++ progmodes/python.el 11 Apr 2008 17:50:55 -0000      1.58.2.13
@@ -2291,9 +2291,11 @@
                                                 (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))