diff options
| author | Stefan Monnier <[email protected]> | 2008-10-26 05:10:54 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2008-10-26 05:10:54 +0000 |
| commit | f75501733f3288b8ea4eddc903cc59c7227304bc (patch) | |
| tree | 20619dbc60f777aa1640856608d09f1b5cdf20f6 /lisp | |
| parent | f37a389e680b3edafa401c38be3650aecd06d2dd (diff) | |
(python-mode): Don't impose ourselves on hippie.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8abb20b481..5c74b7763d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2008-10-26 Stefan Monnier <[email protected]> + * 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 --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 5fbd617be1..3e8cefe6a4 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2473,10 +2473,12 @@ with skeleton expansions for compound statement templates. '((< '(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)) |