diff options
| author | Eli Zaretskii | 2018-04-13 16:44:05 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2018-04-13 16:44:05 +0300 |
| commit | 6bdcaec885fb1272617e7e02c6d1e571163b15f5 (patch) | |
| tree | a510888934c29465e43d744083cabea5e51cf841 | |
| parent | febac2796b01b120476c9c38bfe1b32fb4f56f23 (diff) | |
| download | emacs-6bdcaec885fb1272617e7e02c6d1e571163b15f5.tar.gz emacs-6bdcaec885fb1272617e7e02c6d1e571163b15f5.zip | |
Fix typos and minor wording issues in ELisp manual
* doc/lispref/internals.texi (Writing Emacs Primitives):
* doc/lispref/display.texi (Temporary Displays): Fix typos.
* doc/lispref/text.texi (Filling, Changing Properties)
(Transposition): Clarify and fix typos.
* doc/lispref/positions.texi (Screen Lines): Improve wording.
* doc/lispref/modes.texi (Minor Mode Conventions)
(Font Lock Multiline): Fix typos.
* doc/lispref/variables.texi (Dynamic Binding Tips): Fix a
cross-reference. Fix a typo.
* doc/lispref/sequences.texi (Sequence Functions): Fix typos.
(Bug#31143)
| -rw-r--r-- | doc/lispref/internals.texi | 4 | ||||
| -rw-r--r-- | doc/lispref/modes.texi | 9 | ||||
| -rw-r--r-- | doc/lispref/positions.texi | 6 | ||||
| -rw-r--r-- | doc/lispref/sequences.texi | 4 | ||||
| -rw-r--r-- | doc/lispref/text.texi | 12 | ||||
| -rw-r--r-- | doc/lispref/variables.texi | 15 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 2 |
7 files changed, 27 insertions, 25 deletions
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 398ea8de855..e6043357a11 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi | |||
| @@ -739,7 +739,7 @@ DEFUN ("foo", Ffoo, Sfoo, 0, UNEVALLED, 0 | |||
| 739 | "(list (read-char-by-name \"Insert character: \")\ | 739 | "(list (read-char-by-name \"Insert character: \")\ |
| 740 | (prefix-numeric-value current-prefix-arg)\ | 740 | (prefix-numeric-value current-prefix-arg)\ |
| 741 | t))", | 741 | t))", |
| 742 | doc: /* @dots{} /*) | 742 | doc: /* @dots{} */) |
| 743 | @end group | 743 | @end group |
| 744 | @end example | 744 | @end example |
| 745 | 745 | ||
| @@ -769,7 +769,7 @@ this: | |||
| 769 | @example | 769 | @example |
| 770 | @group | 770 | @group |
| 771 | DEFUN ("bar", Fbar, Sbar, 0, UNEVALLED, 0 | 771 | DEFUN ("bar", Fbar, Sbar, 0, UNEVALLED, 0 |
| 772 | doc: /* @dots{} /* | 772 | doc: /* @dots{} */ |
| 773 | attributes: @var{attr1} @var{attr2} @dots{}) | 773 | attributes: @var{attr1} @var{attr2} @dots{}) |
| 774 | @end group | 774 | @end group |
| 775 | @end example | 775 | @end example |
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index f1a00e72f3d..8a77745d8f7 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi | |||
| @@ -1388,9 +1388,10 @@ similar to the code generated by the @code{define-minor-mode} macro): | |||
| 1388 | 1388 | ||
| 1389 | @example | 1389 | @example |
| 1390 | (interactive (list (or current-prefix-arg 'toggle))) | 1390 | (interactive (list (or current-prefix-arg 'toggle))) |
| 1391 | (let ((enable (if (eq arg 'toggle) | 1391 | (let ((enable |
| 1392 | (not foo-mode) ; @r{this mode's mode variable} | 1392 | (if (eq arg 'toggle) |
| 1393 | (> (prefix-numeric-value arg) 0)))) | 1393 | (not foo-mode) ; @r{this is the mode's mode variable} |
| 1394 | (> (prefix-numeric-value arg) 0)))) | ||
| 1394 | (if enable | 1395 | (if enable |
| 1395 | @var{do-enable} | 1396 | @var{do-enable} |
| 1396 | @var{do-disable})) | 1397 | @var{do-disable})) |
| @@ -3375,7 +3376,7 @@ easy to add the @code{font-lock-multiline} property by hand. | |||
| 3375 | 3376 | ||
| 3376 | The @code{font-lock-multiline} property is meant to ensure proper | 3377 | The @code{font-lock-multiline} property is meant to ensure proper |
| 3377 | refontification; it does not automatically identify new multiline | 3378 | refontification; it does not automatically identify new multiline |
| 3378 | constructs. Identifying the requires that Font Lock mode operate on | 3379 | constructs. Identifying them requires that Font Lock mode operate on |
| 3379 | large enough chunks at a time. This will happen by accident on many | 3380 | large enough chunks at a time. This will happen by accident on many |
| 3380 | cases, which may give the impression that multiline constructs magically | 3381 | cases, which may give the impression that multiline constructs magically |
| 3381 | work. If you set the @code{font-lock-multiline} variable | 3382 | work. If you set the @code{font-lock-multiline} variable |
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index fdc8bb96ae9..a09b6b6d097 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi | |||
| @@ -569,9 +569,9 @@ The optional argument @var{cur-col} specifies the current column when | |||
| 569 | the function is called. This is the window-relative horizontal | 569 | the function is called. This is the window-relative horizontal |
| 570 | coordinate of point, measured in units of font width of the frame's | 570 | coordinate of point, measured in units of font width of the frame's |
| 571 | default face. Providing it speeds up the function, especially in very | 571 | default face. Providing it speeds up the function, especially in very |
| 572 | long lines, because it doesn't have to go back in the buffer in order | 572 | long lines, because the function doesn't have to go back in the buffer |
| 573 | to determine the current column. Note that @var{cur-col} is also | 573 | in order to determine the current column. Note that @var{cur-col} is |
| 574 | counted from the visual start of the line. | 574 | also counted from the visual start of the line. |
| 575 | @end defun | 575 | @end defun |
| 576 | 576 | ||
| 577 | @defun count-screen-lines &optional beg end count-final-newline window | 577 | @defun count-screen-lines &optional beg end count-final-newline window |
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 3a599e5f535..f347cd9e980 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi | |||
| @@ -728,7 +728,7 @@ to every element of @var{sequence} returns non-@code{nil}. | |||
| 728 | @result{} t | 728 | @result{} t |
| 729 | @end group | 729 | @end group |
| 730 | @group | 730 | @group |
| 731 | (seq-some #'numberp [2 4 "6"]) | 731 | (seq-every-p #'numberp [2 4 "6"]) |
| 732 | @result{} nil | 732 | @result{} nil |
| 733 | @end group | 733 | @end group |
| 734 | @end example | 734 | @end example |
| @@ -854,7 +854,7 @@ it is a function of two arguments to use instead of the default @code{equal}. | |||
| 854 | @end group | 854 | @end group |
| 855 | @group | 855 | @group |
| 856 | (seq-uniq '(1 2 2.0 1.0) #'=) | 856 | (seq-uniq '(1 2 2.0 1.0) #'=) |
| 857 | @result{} [1 2] | 857 | @result{} (1 2) |
| 858 | @end group | 858 | @end group |
| 859 | @end example | 859 | @end example |
| 860 | @end defun | 860 | @end defun |
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 0e1c9941e95..2db58f31237 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -1612,7 +1612,7 @@ that the line ends exactly at @code{fill-column}. It returns | |||
| 1612 | 1612 | ||
| 1613 | The argument @var{how}, if non-@code{nil} specifies explicitly the style | 1613 | The argument @var{how}, if non-@code{nil} specifies explicitly the style |
| 1614 | of justification. It can be @code{left}, @code{right}, @code{full}, | 1614 | of justification. It can be @code{left}, @code{right}, @code{full}, |
| 1615 | @code{center}, or @code{none}. If it is @code{t}, that means to do | 1615 | @code{center}, or @code{none}. If it is @code{t}, that means to |
| 1616 | follow specified justification style (see @code{current-justification}, | 1616 | follow specified justification style (see @code{current-justification}, |
| 1617 | below). @code{nil} means to do full justification. | 1617 | below). @code{nil} means to do full justification. |
| 1618 | 1618 | ||
| @@ -2976,7 +2976,7 @@ If any text in the region already has a non-@code{nil} @code{face} property, | |||
| 2976 | those face(s) are retained. This function sets the @code{face} | 2976 | those face(s) are retained. This function sets the @code{face} |
| 2977 | property to a list of faces, with @var{face} as the first element (by | 2977 | property to a list of faces, with @var{face} as the first element (by |
| 2978 | default) and the pre-existing faces as the remaining elements. If the | 2978 | default) and the pre-existing faces as the remaining elements. If the |
| 2979 | optional argument @var{append} is non-@code{nil}, @var{face} is | 2979 | optional argument @var{appendp} is non-@code{nil}, @var{face} is |
| 2980 | appended to the end of the list instead. Note that in a face list, | 2980 | appended to the end of the list instead. Note that in a face list, |
| 2981 | the first occurring value for each attribute takes precedence. | 2981 | the first occurring value for each attribute takes precedence. |
| 2982 | 2982 | ||
| @@ -4297,10 +4297,10 @@ read register names use this function. | |||
| 4297 | This function can be used to transpose stretches of text: | 4297 | This function can be used to transpose stretches of text: |
| 4298 | 4298 | ||
| 4299 | @defun transpose-regions start1 end1 start2 end2 &optional leave-markers | 4299 | @defun transpose-regions start1 end1 start2 end2 &optional leave-markers |
| 4300 | This function exchanges two nonoverlapping portions of the buffer. | 4300 | This function exchanges two nonoverlapping portions of the buffer (if |
| 4301 | Arguments @var{start1} and @var{end1} specify the bounds of one portion | 4301 | they overlap, the function signals an error). Arguments @var{start1} |
| 4302 | and arguments @var{start2} and @var{end2} specify the bounds of the | 4302 | and @var{end1} specify the bounds of one portion and arguments |
| 4303 | other portion. | 4303 | @var{start2} and @var{end2} specify the bounds of the other portion. |
| 4304 | 4304 | ||
| 4305 | Normally, @code{transpose-regions} relocates markers with the transposed | 4305 | Normally, @code{transpose-regions} relocates markers with the transposed |
| 4306 | text; a marker previously positioned within one of the two transposed | 4306 | text; a marker previously positioned within one of the two transposed |
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 4d04335d83a..af1bed461c0 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi | |||
| @@ -1004,12 +1004,13 @@ affect, nor be affected by, any uses of the same variable symbol | |||
| 1004 | elsewhere in the program. | 1004 | elsewhere in the program. |
| 1005 | 1005 | ||
| 1006 | @item | 1006 | @item |
| 1007 | Otherwise, define the variable with @code{defvar}, @code{defconst}, or | 1007 | Otherwise, define the variable with @code{defvar}, @code{defconst} |
| 1008 | @code{defcustom}. @xref{Defining Variables}. Usually, the definition | 1008 | (@pxref{Defining Variables}), or @code{defcustom} (@pxref{Variable |
| 1009 | should be at top-level in an Emacs Lisp file. As far as possible, it | 1009 | Definitions}). Usually, the definition should be at top-level in an |
| 1010 | should include a documentation string which explains the meaning and | 1010 | Emacs Lisp file. As far as possible, it should include a |
| 1011 | purpose of the variable. You should also choose the variable's name | 1011 | documentation string which explains the meaning and purpose of the |
| 1012 | to avoid name conflicts (@pxref{Coding Conventions}). | 1012 | variable. You should also choose the variable's name to avoid name |
| 1013 | conflicts (@pxref{Coding Conventions}). | ||
| 1013 | 1014 | ||
| 1014 | Then you can bind the variable anywhere in a program, knowing reliably | 1015 | Then you can bind the variable anywhere in a program, knowing reliably |
| 1015 | what the effect will be. Wherever you encounter the variable, it will | 1016 | what the effect will be. Wherever you encounter the variable, it will |
| @@ -1024,7 +1025,7 @@ variables like @code{case-fold-search}: | |||
| 1024 | @group | 1025 | @group |
| 1025 | (defun search-for-abc () | 1026 | (defun search-for-abc () |
| 1026 | "Search for the string \"abc\", ignoring case differences." | 1027 | "Search for the string \"abc\", ignoring case differences." |
| 1027 | (let ((case-fold-search nil)) | 1028 | (let ((case-fold-search t)) |
| 1028 | (re-search-forward "abc"))) | 1029 | (re-search-forward "abc"))) |
| 1029 | @end group | 1030 | @end group |
| 1030 | @end example | 1031 | @end example |
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 8d8877bdfda..f5de2fc90ba 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi | |||
| @@ -904,7 +904,7 @@ include mode and header line and a bottom divider, if any. | |||
| 904 | 904 | ||
| 905 | If @var{window} is part of a horizontal combination and the value of the | 905 | If @var{window} is part of a horizontal combination and the value of the |
| 906 | option @code{fit-window-to-buffer-horizontally} (see below) is | 906 | option @code{fit-window-to-buffer-horizontally} (see below) is |
| 907 | non-@code{nil}, this function adjusts @var{window}'s height. The new | 907 | non-@code{nil}, this function adjusts @var{window}'s width. The new |
| 908 | width of @var{window} is calculated from the maximum length of its | 908 | width of @var{window} is calculated from the maximum length of its |
| 909 | buffer's lines that follow the current start position of @var{window}. | 909 | buffer's lines that follow the current start position of @var{window}. |
| 910 | The optional argument @var{max-width} specifies a maximum width and | 910 | The optional argument @var{max-width} specifies a maximum width and |