From b22d06865b8497477b16d41388941cf231909b25 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 12 Oct 2013 22:17:42 -0700 Subject: Doc fixes for text-scale-adjust * lisp/face-remap.el (text-scale-adjust): Doc fix. * doc/emacs/display.texi (Text Scale): Update text-scale-adjust details. Fixes: debbugs:15434 --- doc/emacs/ChangeLog | 2 ++ doc/emacs/display.texi | 4 ++-- lisp/ChangeLog | 2 ++ lisp/face-remap.el | 8 +++----- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 30211fe7fb..d37c30ea81 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,7 @@ 2013-10-13 Glenn Morris + * display.texi (Text Scale): Update text-scale-adjust details. + * ack.texi (Acknowledgments): * emacs.texi (Acknowledgments): Use accented form of some names. diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 9327e7c807..80dffe2e4c 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -743,9 +743,9 @@ determine which action to take. @kbd{C-x}. For instance, @kbd{C-x C-= C-= C-=} increases the face height by three steps. Each step scales the text height by a factor of 1.2; to change this factor, customize the variable -@code{text-scale-mode-step}. As an exception, a numeric argument of 0 +@code{text-scale-mode-step}. A numeric argument of 0 to the @code{text-scale-adjust} command restores the default height, -similar to typing @kbd{C-x C-0}. +the same as typing @kbd{C-x C-0}. @cindex increase buffer face height @findex text-scale-increase diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1791cd5357..915639c94a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-10-13 Glenn Morris + * face-remap.el (text-scale-adjust): Doc fix. (Bug#15434) + * emacs-lisp/authors.el (authors-aliases, authors-ignored-files): Add some entries. (authors-fixed-entries): Use accented form of name. diff --git a/lisp/face-remap.el b/lisp/face-remap.el index e4ec602efe..7517023779 100644 --- a/lisp/face-remap.el +++ b/lisp/face-remap.el @@ -299,11 +299,9 @@ key-binding used to invoke the command, with all modifiers removed: - Decrease the default face height by one step 0 Reset the default face height to the global default -When adjusting with `+' or `-', continue to read input events and -further adjust the face height as long as the input event read -\(with all modifiers removed) is `+' or `-'. - -When adjusting with `0', immediately finish. +After adjusting, continue to read input events and further adjust +the face height as long as the input event read +\(with all modifiers removed) is one of the above characters. Each step scales the height of the default face by the variable `text-scale-mode-step' (a negative number of steps decreases the -- cgit v1.2.3