Mercurial > emacs
changeset 80499:0681f498ce1a
(python-mode): Don't mess with hippie-expand.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 11 Apr 2008 17:50:56 +0000 |
| parents | 8df650d0126a |
| children | 82cbd6e365cf |
| files | lisp/ChangeLog lisp/progmodes/python.el |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Apr 11 10:23:49 2008 +0000 +++ b/lisp/ChangeLog Fri Apr 11 17:50:56 2008 +0000 @@ -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.
--- a/lisp/progmodes/python.el Fri Apr 11 10:23:49 2008 +0000 +++ b/lisp/progmodes/python.el Fri Apr 11 17:50:56 2008 +0000 @@ -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))