[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100354: * progmodes/python.el (python-mode): Don't impose font-lock.

[Stefan Monnier]

------------------------------------------------------------
revno: 100354
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Sun 2011-01-02 22:49:13 -0500
message:
  * progmodes/python.el (python-mode): Don't impose font-lock.
modified:
  lisp/ChangeLog
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-02 18:58:36 +0000
+++ b/lisp/ChangeLog    2011-01-03 03:49:13 +0000
@@ -1,3 +1,7 @@
+2011-01-03  Stefan Monnier  <address@hidden>
+
+       * progmodes/python.el (python-mode): Don't impose font-lock (bug#3628).
+
 2011-01-02  Stefan Monnier  <address@hidden>
 
        * files.el (file-local-variables-alist):

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2011-01-02 23:50:46 +0000
+++ b/lisp/progmodes/python.el  2011-01-03 03:49:13 +0000
@@ -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)