diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6ec62fe628f..1f522ff4b06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-01-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/python.el (python-mode): Don't impose font-lock (bug#3628). + 2011-01-02 Stefan Monnier <monnier@iro.umontreal.ca> * files.el (file-local-variables-alist): diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index d05f352ded6..d21137b3080 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2552,7 +2552,6 @@ with skeleton expansions for compound statement templates. (^ '(- (1+ (current-indentation)))))) ;; Python defines TABs as being 8-char wide. (set (make-local-variable 'tab-width) 8) - (unless font-lock-mode (font-lock-mode 1)) (when python-guess-indent (python-guess-indent)) ;; Let's make it harder for the user to shoot himself in the foot. (unless (= tab-width python-indent) |