Mercurial > emacs
changeset 99145:9f4cc3f73286
(python-mode): Don't impose ourselves on hippie.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 26 Oct 2008 05:10:54 +0000 |
| parents | b7eb74a4d86b |
| children | c75ecb203637 |
| files | lisp/ChangeLog lisp/progmodes/python.el |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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))