diff options
| author | Paul Eggert | 2018-07-23 00:05:25 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-07-23 00:07:02 -0700 |
| commit | 109cb1520c690038d387aa290bb03261f7c5a1f6 (patch) | |
| tree | 75fd79ee186e33c4df6a54036f20287c63849f9a | |
| parent | 216b9b2dbff4cd6843d988c1e2df81b1e02a52fd (diff) | |
| download | emacs-109cb1520c690038d387aa290bb03261f7c5a1f6.tar.gz emacs-109cb1520c690038d387aa290bb03261f7c5a1f6.zip | |
positive → nonnegative doc fixes
* doc/lispref/numbers.texi (Bitwise Operations)
(Math Functions):
* doc/lispref/strings.texi (Formatting Strings):
* src/editfns.c (Fformat):
Correct “positive” with “nonnegative” in some documentation.
| -rw-r--r-- | doc/lispref/numbers.texi | 4 | ||||
| -rw-r--r-- | doc/lispref/strings.texi | 8 | ||||
| -rw-r--r-- | src/editfns.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi index 70bb1030411..14d5059ffb3 100644 --- a/doc/lispref/numbers.texi +++ b/doc/lispref/numbers.texi | |||
| @@ -853,7 +853,7 @@ reproducing the same pattern moved over. | |||
| 853 | bits in @var{integer1} to the left @var{count} places, or to the right | 853 | bits in @var{integer1} to the left @var{count} places, or to the right |
| 854 | if @var{count} is negative, bringing zeros into the vacated bits. If | 854 | if @var{count} is negative, bringing zeros into the vacated bits. If |
| 855 | @var{count} is negative, @code{lsh} shifts zeros into the leftmost | 855 | @var{count} is negative, @code{lsh} shifts zeros into the leftmost |
| 856 | (most-significant) bit, producing a positive result even if | 856 | (most-significant) bit, producing a nonnegative result even if |
| 857 | @var{integer1} is negative. Contrast this with @code{ash}, below. | 857 | @var{integer1} is negative. Contrast this with @code{ash}, below. |
| 858 | 858 | ||
| 859 | Here are two examples of @code{lsh}, shifting a pattern of bits one | 859 | Here are two examples of @code{lsh}, shifting a pattern of bits one |
| @@ -1233,7 +1233,7 @@ returns a NaN. | |||
| 1233 | 1233 | ||
| 1234 | @defun expt x y | 1234 | @defun expt x y |
| 1235 | This function returns @var{x} raised to power @var{y}. If both | 1235 | This function returns @var{x} raised to power @var{y}. If both |
| 1236 | arguments are integers and @var{y} is positive, the result is an | 1236 | arguments are integers and @var{y} is nonnegative, the result is an |
| 1237 | integer; in this case, overflow causes truncation, so watch out. | 1237 | integer; in this case, overflow causes truncation, so watch out. |
| 1238 | If @var{x} is a finite negative number and @var{y} is a finite | 1238 | If @var{x} is a finite negative number and @var{y} is a finite |
| 1239 | non-integer, @code{expt} returns a NaN. | 1239 | non-integer, @code{expt} returns a NaN. |
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 026ba749cbd..f68199e9f98 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi | |||
| @@ -1015,11 +1015,11 @@ numbered or unnumbered format specifications but not both, except that | |||
| 1015 | After the @samp{%} and any field number, you can put certain | 1015 | After the @samp{%} and any field number, you can put certain |
| 1016 | @dfn{flag characters}. | 1016 | @dfn{flag characters}. |
| 1017 | 1017 | ||
| 1018 | The flag @samp{+} inserts a plus sign before a positive number, so | 1018 | The flag @samp{+} inserts a plus sign before a nonnegative number, so |
| 1019 | that it always has a sign. A space character as flag inserts a space | 1019 | that it always has a sign. A space character as flag inserts a space |
| 1020 | before a positive number. (Otherwise, positive numbers start with the | 1020 | before a nonnegative number. (Otherwise, nonnegative numbers start with the |
| 1021 | first digit.) These flags are useful for ensuring that positive | 1021 | first digit.) These flags are useful for ensuring that nonnegative |
| 1022 | numbers and negative numbers use the same number of columns. They are | 1022 | and negative numbers use the same number of columns. They are |
| 1023 | ignored except for @samp{%d}, @samp{%e}, @samp{%f}, @samp{%g}, and if | 1023 | ignored except for @samp{%d}, @samp{%e}, @samp{%f}, @samp{%g}, and if |
| 1024 | both flags are used, @samp{+} takes precedence. | 1024 | both flags are used, @samp{+} takes precedence. |
| 1025 | 1025 | ||
diff --git a/src/editfns.c b/src/editfns.c index 4dbf4805721..ccc0d27b139 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -4195,8 +4195,8 @@ Nth argument is substituted instead of the next one. A format can | |||
| 4195 | contain either numbered or unnumbered %-sequences but not both, except | 4195 | contain either numbered or unnumbered %-sequences but not both, except |
| 4196 | that %% can be mixed with numbered %-sequences. | 4196 | that %% can be mixed with numbered %-sequences. |
| 4197 | 4197 | ||
| 4198 | The + flag character inserts a + before any positive number, while a | 4198 | The + flag character inserts a + before any nonnegative number, while a |
| 4199 | space inserts a space before any positive number; these flags only | 4199 | space inserts a space before any nonnegative number; these flags only |
| 4200 | affect %d, %e, %f, and %g sequences, and the + flag takes precedence. | 4200 | affect %d, %e, %f, and %g sequences, and the + flag takes precedence. |
| 4201 | The - and 0 flags affect the width specifier, as described below. | 4201 | The - and 0 flags affect the width specifier, as described below. |
| 4202 | 4202 | ||