# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1294026553 18000
# Node ID 02196c405b195b0c708061a3477b83f6f7506724
# Parent  5f7efaa8604a03e85ecda76c8e06941a21c7d058
* progmodes/python.el (python-mode): Don't impose font-lock.

diff -r 5f7efaa8604a -r 02196c405b19 lisp/ChangeLog
--- 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):
diff -r 5f7efaa8604a -r 02196c405b19 lisp/progmodes/python.el
--- 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)