procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Stefan Monnier 2008-04-11 17:50:56 +00:00
parent da44dd8487
commit 7f9020f1a2
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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.

8
lisp/progmodes/python.el
View file

@ -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))