Mercurial > emacs

changeset 112223:02196c405b19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* progmodes/python.el (python-mode): Don't impose font-lock.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 02 Jan 2011 22:49:13 -0500
parents 5f7efaa8604a
children 4af12aa726d1
files lisp/ChangeLog lisp/progmodes/python.el
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Jan 02 17:14:03 2011 -0800
+++ b/lisp/ChangeLog	Sun Jan 02 22:49:13 2011 -0500
@@ -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):
--- a/lisp/progmodes/python.el	Sun Jan 02 17:14:03 2011 -0800
+++ b/lisp/progmodes/python.el	Sun Jan 02 22:49:13 2011 -0500
@@ -2552,7 +2552,6 @@
 	 (^ '(- (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)