Mercurial > emacs
changeset 96080:2b046bd8b819
Fix behavior of text-scale-increase when text-scale-mode is disabled
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1257
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 19 Jun 2008 02:17:16 +0000 |
| parents | efbaf6995245 |
| children | 116dc7c6e345 |
| files | lisp/ChangeLog lisp/face-remap.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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'
--- 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