# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1272392056 14400
# Node ID c46b2d0614cb790ce656b085569b60abd74d5bb2
# Parent  624169215019502e34ca6acf8783d7fcce3cb570
Let the user turn off locally a globalized minor mode
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
Avoid re-enabling a minor mode after the user turned the minor mode
off if MODE-enable-in-buffers is run twice (typically once from
fundamental-mode's after-change-major-mode-hook and a second time from
run-mode-hook's own after-change-major-mode-hook).

diff -r 624169215019 -r c46b2d0614cb lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Apr 27 13:57:32 2010 -0400
+++ b/lisp/ChangeLog	Tue Apr 27 14:14:16 2010 -0400
@@ -1,5 +1,11 @@
 2010-04-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
+	Avoid re-enabling a minor mode after the user turned the minor mode
+	off if MODE-enable-in-buffers is run twice (typically once from
+	fundamental-mode's after-change-major-mode-hook and a second time from
+	run-mode-hook's own after-change-major-mode-hook).
+
 	* emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.
 
 2010-04-27  Sam Steingold  <sds@gnu.org>
diff -r 624169215019 -r c46b2d0614cb lisp/emacs-lisp/easy-mmode.el
--- a/lisp/emacs-lisp/easy-mmode.el	Tue Apr 27 13:57:32 2010 -0400
+++ b/lisp/emacs-lisp/easy-mmode.el	Tue Apr 27 14:14:16 2010 -0400
@@ -361,13 +361,14 @@
 	 (dolist (buf ,MODE-buffers)
 	   (when (buffer-live-p buf)
 	     (with-current-buffer buf
-	       (if ,mode
-		   (unless (eq ,MODE-major-mode major-mode)
-		     (,mode -1)
-		     (,turn-on)
-		     (setq ,MODE-major-mode major-mode))
-		 (,turn-on)
-		 (setq ,MODE-major-mode major-mode))))))
+               (unless (eq ,MODE-major-mode major-mode)
+                 (if ,mode
+                     (progn
+                       (,mode -1)
+                       (,turn-on)
+                       (setq ,MODE-major-mode major-mode))
+                   (,turn-on)
+                   (setq ,MODE-major-mode major-mode)))))))
        (put ',MODE-enable-in-buffers 'definition-name ',global-mode)
 
        (defun ,MODE-check-buffers ()