summaryrefslogtreecommitdiff
path: root/lisp/face-remap.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2008-06-19 02:17:16 +0000
committerMiles Bader <miles@gnu.org>2008-06-19 02:17:16 +0000
commitdced1efdffdc7896403d88bd818a324c6a864a98 (patch)
tree83604dcff320bd5af244b04e1bf658c287f0e539 /lisp/face-remap.el
parent27129af9d775855efb529d63d2d5c62af2699afe (diff)
downloademacs-dced1efdffdc7896403d88bd818a324c6a864a98.tar.gz
Fix behavior of text-scale-increase when text-scale-mode is disabled
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1257
Diffstat (limited to 'lisp/face-remap.el')
-rw-r--r--lisp/face-remap.el3
1 files changed, 2 insertions, 1 deletions
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