diff options
| author | Miles Bader <miles@gnu.org> | 2008-06-19 02:17:16 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-06-19 02:17:16 +0000 |
| commit | dced1efdffdc7896403d88bd818a324c6a864a98 (patch) | |
| tree | 83604dcff320bd5af244b04e1bf658c287f0e539 | |
| parent | 27129af9d775855efb529d63d2d5c62af2699afe (diff) | |
| download | emacs-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
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/face-remap.el | 3 |
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 |