# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1213841836 0
# Node ID 2b046bd8b81933206c88e3a71a1ea2404d524215
# Parent  efbaf69952454b0fbb89cb4e6a6d6e960ed4229b
Fix behavior of text-scale-increase when text-scale-mode is disabled

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1257

diff -r efbaf6995245 -r 2b046bd8b819 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jun 19 01:57:19 2008 +0000
+++ b/lisp/ChangeLog	Thu Jun 19 02:17:16 2008 +0000
@@ -1,3 +1,8 @@
+2008-06-19  Miles Bader  <miles@gnu.org>
+
+	* face-remap.el (text-scale-increase): Start from zero if
+	text-scale-mode isn't enabled.
+
 2008-06-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* faces.el (face-set-after-frame-default): Re-apply explicit `font'
diff -r efbaf6995245 -r 2b046bd8b819 lisp/face-remap.el
--- a/lisp/face-remap.el	Thu Jun 19 01:57:19 2008 +0000
+++ b/lisp/face-remap.el	Thu Jun 19 02:17:16 2008 +0000
@@ -234,7 +234,8 @@
 height by the same amount).  As a special case, an argument of 0
 will remove any scaling currently active."
   (interactive "p")
-  (setq text-scale-mode-amount (if (= inc 0) 0 (+ text-scale-mode-amount inc)))
+  (setq text-scale-mode-amount
+	(if (= inc 0) 0 (+ (if text-scale-mode text-scale-mode-amount 0) inc)))
   (text-scale-mode (if (zerop text-scale-mode-amount) -1 1)))
 
 ;;;###autoload