Fix behavior of text-scale-increase when text-scale-mode is disabled

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

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90b9b297b55..ca4aeafe5c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/face-remap.el b/lisp/face-remap.el
index 2988e399161..ddc9f22ddfa 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -234,7 +234,8 @@ Each step scales the height of the default face by the variable
 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