diff options
| author | Paul Eggert | 2019-12-09 18:44:35 -0800 |
|---|---|---|
| committer | Paul Eggert | 2019-12-09 18:45:18 -0800 |
| commit | d1a791f8edc1b8f2189b6f1b3be7b946fef1edbc (patch) | |
| tree | fb415df3de5b00b9ce7616872ead40c983b55a12 | |
| parent | 28578f87b52ead4d31479fdcfba028118dfa6987 (diff) | |
| download | emacs-d1a791f8edc1b8f2189b6f1b3be7b946fef1edbc.tar.gz emacs-d1a791f8edc1b8f2189b6f1b3be7b946fef1edbc.zip | |
Spelling fixes
49 files changed, 119 insertions, 118 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3 index a5eec1f5736..43c7e23f485 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 | |||
| @@ -1039,7 +1039,7 @@ | |||
| 1039 | recursively sorted with the same mechanism. That way variables tied | 1039 | recursively sorted with the same mechanism. That way variables tied |
| 1040 | to a particular subdirectory override those in a parent directory. | 1040 | to a particular subdirectory override those in a parent directory. |
| 1041 | 1041 | ||
| 1042 | Previously the behaviour didn’t seem to be well defined anyway and was | 1042 | Previously the behavior didn’t seem to be well defined anyway and was |
| 1043 | dependent on the order they appeared in the file. However this order | 1043 | dependent on the order they appeared in the file. However this order |
| 1044 | was changed in version 26.1 and it probably also depended on the | 1044 | was changed in version 26.1 and it probably also depended on the |
| 1045 | number of dir-local files that are merged. | 1045 | number of dir-local files that are merged. |
| @@ -7238,7 +7238,8 @@ | |||
| 7238 | 7238 | ||
| 7239 | 2018-04-17 Andreas Schwab <schwab@suse.de> | 7239 | 2018-04-17 Andreas Schwab <schwab@suse.de> |
| 7240 | 7240 | ||
| 7241 | Fix undefined behaviour while looking for lexical-binding file variable (bug 31186) | 7241 | Fix undefined behavior while looking for lexical-binding file |
| 7242 | variable (bug 31186). | ||
| 7242 | 7243 | ||
| 7243 | * src/lread.c (lisp_file_lexically_bound_p): Reset | 7244 | * src/lread.c (lisp_file_lexically_bound_p): Reset |
| 7244 | beg_end_state before reading variable or value. | 7245 | beg_end_state before reading variable or value. |
| @@ -63858,7 +63859,7 @@ | |||
| 63858 | 63859 | ||
| 63859 | 2016-01-20 Eli Zaretskii <eliz@gnu.org> | 63860 | 2016-01-20 Eli Zaretskii <eliz@gnu.org> |
| 63860 | 63861 | ||
| 63861 | Anoter fix for problematic merge from emacs-25 | 63862 | Another fix for problematic merge from emacs-25 |
| 63862 | 63863 | ||
| 63863 | * src/w32fns.c (globals_of_w32fns): Move initialization of | 63864 | * src/w32fns.c (globals_of_w32fns): Move initialization of |
| 63864 | resetstkoflw to a non-Cygwin part. | 63865 | resetstkoflw to a non-Cygwin part. |
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 87484f00e40..8a40d11fc28 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi | |||
| @@ -99,7 +99,7 @@ keys and the fullscreen behavior. To see all such options, use | |||
| 99 | 99 | ||
| 100 | @subsection Modifier keys | 100 | @subsection Modifier keys |
| 101 | 101 | ||
| 102 | The following variables control the behaviour of the actual modifier | 102 | The following variables control the behavior of the actual modifier |
| 103 | keys: | 103 | keys: |
| 104 | 104 | ||
| 105 | @table @code | 105 | @table @code |
| @@ -135,12 +135,12 @@ which describes the modifier when used with ordinary keys, function keys | |||
| 135 | If the @var{symbol} is one of @code{control}, @code{meta}, @code{alt}, | 135 | If the @var{symbol} is one of @code{control}, @code{meta}, @code{alt}, |
| 136 | @code{super} or @code{hyper}, this describes the Emacs modifier it | 136 | @code{super} or @code{hyper}, this describes the Emacs modifier it |
| 137 | represents. If @var{symbol} is @code{none}, Emacs does not use the | 137 | represents. If @var{symbol} is @code{none}, Emacs does not use the |
| 138 | key, which retains its standard behaviour. For instance, the | 138 | key, which retains its standard behavior. For instance, the |
| 139 | @key{Option} key in macOS is then used for composing additional | 139 | @key{Option} key in macOS is then used for composing additional |
| 140 | characters. | 140 | characters. |
| 141 | 141 | ||
| 142 | The variables for right-hand keys, like @code{ns-right-alternate-modifier}, | 142 | The variables for right-hand keys, like @code{ns-right-alternate-modifier}, |
| 143 | may also be set to @code{left}, which means to use the same behaviour as | 143 | may also be set to @code{left}, which means to use the same behavior as |
| 144 | the corresponding left-hand key. | 144 | the corresponding left-hand key. |
| 145 | 145 | ||
| 146 | @subsection Font Panel | 146 | @subsection Font Panel |
| @@ -210,7 +210,7 @@ the mouse. | |||
| 210 | 210 | ||
| 211 | The sending application has some limited ability to decide how Emacs | 211 | The sending application has some limited ability to decide how Emacs |
| 212 | handles the sent object, but the user may override the default | 212 | handles the sent object, but the user may override the default |
| 213 | behaviour by holding one or more modifier key. | 213 | behavior by holding one or more modifier key. |
| 214 | 214 | ||
| 215 | @table @kbd | 215 | @table @kbd |
| 216 | @item control | 216 | @item control |
| @@ -220,7 +220,7 @@ will insert the filename. | |||
| 220 | Attempt to open the object as though it is a file or URL. | 220 | Attempt to open the object as though it is a file or URL. |
| 221 | @item super/command | 221 | @item super/command |
| 222 | Perform the default action for the type. This can be useful when an | 222 | Perform the default action for the type. This can be useful when an |
| 223 | application is overriding the default behaviour. | 223 | application is overriding the default behavior. |
| 224 | @end table | 224 | @end table |
| 225 | 225 | ||
| 226 | The modifier keys listed above are defined by macOS and are unaffected | 226 | The modifier keys listed above are defined by macOS and are unaffected |
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 710e64f4570..3d8e5128403 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi | |||
| @@ -103,7 +103,7 @@ | |||
| 103 | @c number suitable for the title page, and update-date to be the date, | 103 | @c number suitable for the title page, and update-date to be the date, |
| 104 | @c in the preferred style for these. E.g., run the shell command: | 104 | @c in the preferred style for these. E.g., run the shell command: |
| 105 | @c texi2any -D 'edition-number 3.11' \ | 105 | @c texi2any -D 'edition-number 3.11' \ |
| 106 | @c -D 'titlepage-edition-number Revised Third Edtion' \ | 106 | @c -D 'titlepage-edition-number Revised Third Edition' \ |
| 107 | @c -D 'update-date 31 March 2020' | 107 | @c -D 'update-date 31 March 2020' |
| 108 | @c This relates mainly to the published book sold by the FSF. | 108 | @c This relates mainly to the published book sold by the FSF. |
| 109 | 109 | ||
| @@ -3832,7 +3832,7 @@ delimit them from the body of the @code{let}. | |||
| 3832 | @findex if | 3832 | @findex if |
| 3833 | @cindex Conditional with @code{if} | 3833 | @cindex Conditional with @code{if} |
| 3834 | 3834 | ||
| 3835 | Anoter special form is the conditional @code{if}. This form is used | 3835 | Another special form is the conditional @code{if}. This form is used |
| 3836 | to instruct the computer to make decisions. You can write function | 3836 | to instruct the computer to make decisions. You can write function |
| 3837 | definitions without using @code{if}, but it is used often enough, and | 3837 | definitions without using @code{if}, but it is used often enough, and |
| 3838 | is important enough, to be included here. It is used, for example, in | 3838 | is important enough, to be included here. It is used, for example, in |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 48a41f53677..7f77d11d928 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -5622,7 +5622,7 @@ area from the left of the original image, and if negative the offset | |||
| 5622 | from the right. If @var{y} is a positive number it specifies the | 5622 | from the right. If @var{y} is a positive number it specifies the |
| 5623 | offset from the top of the original image, and if negative from the | 5623 | offset from the top of the original image, and if negative from the |
| 5624 | bottom. If @var{x} or @var{y} are @code{nil} or unspecified the crop | 5624 | bottom. If @var{x} or @var{y} are @code{nil} or unspecified the crop |
| 5625 | area will be centred on the original image. | 5625 | area will be centered on the original image. |
| 5626 | 5626 | ||
| 5627 | If the crop area is outside or overlaps the edge of the image it will | 5627 | If the crop area is outside or overlaps the edge of the image it will |
| 5628 | be reduced to exclude any areas outside of the image. This means it | 5628 | be reduced to exclude any areas outside of the image. This means it |
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index f91d5b3423d..013504680bb 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi | |||
| @@ -565,7 +565,7 @@ for threshold exhaustion regularly, for efficiency reasons it does not | |||
| 565 | do so immediately after every change to the heap or to | 565 | do so immediately after every change to the heap or to |
| 566 | @code{gc-cons-threshold} or @code{gc-cons-percentage}, so exhausting | 566 | @code{gc-cons-threshold} or @code{gc-cons-percentage}, so exhausting |
| 567 | the threshold does not immediately trigger garbage collection. Also, | 567 | the threshold does not immediately trigger garbage collection. Also, |
| 568 | for efficency in threshold calculations Emacs approximates the heap | 568 | for efficiency in threshold calculations Emacs approximates the heap |
| 569 | size, which counts the bytes used by currently-accessible objects in | 569 | size, which counts the bytes used by currently-accessible objects in |
| 570 | the heap. | 570 | the heap. |
| 571 | 571 | ||
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index e33ae287ff9..47ce7c8f900 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi | |||
| @@ -2990,7 +2990,7 @@ broadcast address, and network mask. | |||
| 2990 | Optional argument @var{family} specified as symbol @code{ipv4} or | 2990 | Optional argument @var{family} specified as symbol @code{ipv4} or |
| 2991 | @code{ipv6} restricts the returned information to IPv4 and IPv6 | 2991 | @code{ipv6} restricts the returned information to IPv4 and IPv6 |
| 2992 | addresses respectively, independently of the value of @var{full}. | 2992 | addresses respectively, independently of the value of @var{full}. |
| 2993 | Speficying @code{ipv6} when IPv6 support is not available will result | 2993 | Specifying @code{ipv6} when IPv6 support is not available will result |
| 2994 | in an error being signaled. | 2994 | in an error being signaled. |
| 2995 | 2995 | ||
| 2996 | Some examples: | 2996 | Some examples: |
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 74b15cfc7fd..0cb30010c5e 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi | |||
| @@ -1032,7 +1032,7 @@ In conventional string syntax, it would be written | |||
| 1032 | The @code{rx} notation is mainly useful in Lisp code; it cannot be | 1032 | The @code{rx} notation is mainly useful in Lisp code; it cannot be |
| 1033 | used in most interactive situations where a regexp is requested, such | 1033 | used in most interactive situations where a regexp is requested, such |
| 1034 | as when running @code{query-replace-regexp} or in variable | 1034 | as when running @code{query-replace-regexp} or in variable |
| 1035 | customisation. | 1035 | customization. |
| 1036 | 1036 | ||
| 1037 | @menu | 1037 | @menu |
| 1038 | * Rx Constructs:: Constructs valid in rx forms. | 1038 | * Rx Constructs:: Constructs valid in rx forms. |
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 29461bec7a6..0e569fa60cd 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi | |||
| @@ -3218,7 +3218,7 @@ You can tell Emacs the shell's current directory with the command | |||
| 3218 | @item | 3218 | @item |
| 3219 | Third party packages. | 3219 | Third party packages. |
| 3220 | 3220 | ||
| 3221 | Any package you install into Emacs can run arbtitrary code with the | 3221 | Any package you install into Emacs can run arbitrary code with the |
| 3222 | same privileges as the Emacs process itself. Be aware of this when | 3222 | same privileges as the Emacs process itself. Be aware of this when |
| 3223 | you use the package system (e.g. @code{M-x list-packages}) with third | 3223 | you use the package system (e.g. @code{M-x list-packages}) with third |
| 3224 | party archives. Use only third parties that you can trust! | 3224 | party archives. Use only third parties that you can trust! |
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi index 21653b4a6d0..fc5ff54c637 100644 --- a/doc/misc/flymake.texi +++ b/doc/misc/flymake.texi | |||
| @@ -548,7 +548,7 @@ by calling the function @code{flymake-make-diagnostic}. | |||
| 548 | Make a Flymake diagnostic for @var{buffer}'s region from @var{beg} to | 548 | Make a Flymake diagnostic for @var{buffer}'s region from @var{beg} to |
| 549 | @var{end}. @var{type} is a diagnostic symbol (@pxref{Flymake error | 549 | @var{end}. @var{type} is a diagnostic symbol (@pxref{Flymake error |
| 550 | types}), and @var{text} is a description of the problem detected in | 550 | types}), and @var{text} is a description of the problem detected in |
| 551 | this region. Currently, it is unspecified behaviour to make | 551 | this region. Currently, it is unspecified behavior to make |
| 552 | diagnostics for buffers other than the buffer that the Flymake backend | 552 | diagnostics for buffers other than the buffer that the Flymake backend |
| 553 | is responsible for. | 553 | is responsible for. |
| 554 | @end deffn | 554 | @end deffn |
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index f7818a24ca5..7866fcfd5f6 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi | |||
| @@ -8648,7 +8648,7 @@ takes precedence over an @samp{ID} property defined on the node itself. | |||
| 8648 | @item @code{org-attach-method} | 8648 | @item @code{org-attach-method} |
| 8649 | @vindex org-attach-method | 8649 | @vindex org-attach-method |
| 8650 | When attaching files using the dispatcher @kbd{C-c C-a} it | 8650 | When attaching files using the dispatcher @kbd{C-c C-a} it |
| 8651 | defaults to copying files. The behaviour can be changed by | 8651 | defaults to copying files. The behavior can be changed by |
| 8652 | customizing @code{org-attach-method}. Options are Copy, Move/Rename, | 8652 | customizing @code{org-attach-method}. Options are Copy, Move/Rename, |
| 8653 | Hard link or Symbolic link. | 8653 | Hard link or Symbolic link. |
| 8654 | 8654 | ||
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 1ea515b2ae4..8329c1f6fab 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex | |||
| @@ -7690,7 +7690,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% | |||
| 7690 | % If SUBTOPIC is present, precede it with a space, and call \doind. | 7690 | % If SUBTOPIC is present, precede it with a space, and call \doind. |
| 7691 | % (At some time during the 20th century, this made a two-level entry in an | 7691 | % (At some time during the 20th century, this made a two-level entry in an |
| 7692 | % index such as the operation index. Nobody seemed to notice the change in | 7692 | % index such as the operation index. Nobody seemed to notice the change in |
| 7693 | % behaviour though.) | 7693 | % behavior though.) |
| 7694 | \def\dosubind#1#2#3{% | 7694 | \def\dosubind#1#2#3{% |
| 7695 | \def\thirdarg{#3}% | 7695 | \def\thirdarg{#3}% |
| 7696 | \ifx\thirdarg\empty | 7696 | \ifx\thirdarg\empty |
| @@ -743,7 +743,7 @@ column zero. | |||
| 743 | --- | 743 | --- |
| 744 | *** The new 'compilation-transform-file-match-alist' user option can | 744 | *** The new 'compilation-transform-file-match-alist' user option can |
| 745 | be used to transform file name matches compilation output, and remove | 745 | be used to transform file name matches compilation output, and remove |
| 746 | known false positives being recognised as warnings/errors. | 746 | known false positives being recognized as warnings/errors. |
| 747 | 747 | ||
| 748 | ** cl-lib.el | 748 | ** cl-lib.el |
| 749 | +++ | 749 | +++ |
| @@ -1336,7 +1336,7 @@ Of course it will still find it if you have it in "~/.ecompleterc". | |||
| 1336 | 1336 | ||
| 1337 | --- | 1337 | --- |
| 1338 | *** 'mm-uu-diff-groups-regexp' now defaults to matching all groups, | 1338 | *** 'mm-uu-diff-groups-regexp' now defaults to matching all groups, |
| 1339 | which means that "git am" diffs are recognised everywhere. | 1339 | which means that "git am" diffs are recognized everywhere. |
| 1340 | 1340 | ||
| 1341 | +++ | 1341 | +++ |
| 1342 | *** Two new Gnus summary mode navigation commands have been added, | 1342 | *** Two new Gnus summary mode navigation commands have been added, |
| @@ -1987,7 +1987,7 @@ exclude most headers when forwarding. | |||
| 1987 | 1987 | ||
| 1988 | *** 'mml-secure-openpgp-sign-with-sender' sets also "gpg --sender" | 1988 | *** 'mml-secure-openpgp-sign-with-sender' sets also "gpg --sender" |
| 1989 | When 'mml-secure-openpgp-sign-with-sender' is non-nil message sender's | 1989 | When 'mml-secure-openpgp-sign-with-sender' is non-nil message sender's |
| 1990 | email address (in addition to its old behaviour) will also be used to | 1990 | email address (in addition to its old behavior) will also be used to |
| 1991 | set gpg's "--sender email@domain" option. | 1991 | set gpg's "--sender email@domain" option. |
| 1992 | 1992 | ||
| 1993 | The option is useful for two reasons when verifying the signature: | 1993 | The option is useful for two reasons when verifying the signature: |
| @@ -2661,14 +2661,14 @@ Previously, the control key modifier was used to scroll up or down by | |||
| 2661 | an amount which was close to near a full screen. This is now instead | 2661 | an amount which was close to near a full screen. This is now instead |
| 2662 | available by scrolling with the meta modifier key. | 2662 | available by scrolling with the meta modifier key. |
| 2663 | 2663 | ||
| 2664 | To get the old behaviour back, customize the user option | 2664 | To get the old behavior back, customize the user option |
| 2665 | 'mouse-wheel-scroll-amount', or add the following to your init file: | 2665 | 'mouse-wheel-scroll-amount', or add the following to your init file: |
| 2666 | 2666 | ||
| 2667 | (customize-set-variable 'mouse-wheel-scroll-amount | 2667 | (customize-set-variable 'mouse-wheel-scroll-amount |
| 2668 | '(5 ((shift) . 1) ((control) . nil))) | 2668 | '(5 ((shift) . 1) ((control) . nil))) |
| 2669 | 2669 | ||
| 2670 | By default, the font size will be changed in the window that the mouse | 2670 | By default, the font size will be changed in the window that the mouse |
| 2671 | pointer is over. To change this behaviour, you can customize the user | 2671 | pointer is over. To change this behavior, you can customize the user |
| 2672 | option 'mouse-wheel-follow-mouse'. Note that this will also affect | 2672 | option 'mouse-wheel-follow-mouse'. Note that this will also affect |
| 2673 | scrolling. | 2673 | scrolling. |
| 2674 | 2674 | ||
| @@ -3319,8 +3319,8 @@ Previously it was supported only in the Cygwin-w32 build. | |||
| 3319 | ** Emacs now handles key combinations involving the macOS "command" | 3319 | ** Emacs now handles key combinations involving the macOS "command" |
| 3320 | and "option" modifier keys more correctly. | 3320 | and "option" modifier keys more correctly. |
| 3321 | 3321 | ||
| 3322 | ** MacOS modifier key behaviour is now more adjustable. | 3322 | ** MacOS modifier key behavior is now more adjustable. |
| 3323 | The behaviour of the macOS "Option", "Command", "Control" and | 3323 | The behavior of the macOS "Option", "Command", "Control" and |
| 3324 | "Function" keys can now be specified separately for use with | 3324 | "Function" keys can now be specified separately for use with |
| 3325 | ordinary keys, function keys and mouse clicks. This allows using them | 3325 | ordinary keys, function keys and mouse clicks. This allows using them |
| 3326 | in their standard macOS way for composing characters. | 3326 | in their standard macOS way for composing characters. |
| @@ -3370,9 +3370,9 @@ fonts. See the documentation of this function and variable in the | |||
| 3370 | Emacs manual for more details. | 3370 | Emacs manual for more details. |
| 3371 | 3371 | ||
| 3372 | +++ | 3372 | +++ |
| 3373 | ** On NS the behaviour of drag and drop can now be modified by use of | 3373 | ** On NS the behavior of drag and drop can now be modified by use of |
| 3374 | modifier keys in line with Apples guidelines. This makes the drag and | 3374 | modifier keys in line with Apples guidelines. This makes the drag and |
| 3375 | drop behaviour more consistent, as previously the sending application | 3375 | drop behavior more consistent, as previously the sending application |
| 3376 | was able to 'set' modifiers without the knowledge of the user. | 3376 | was able to 'set' modifiers without the knowledge of the user. |
| 3377 | 3377 | ||
| 3378 | ** On NS multicolor font display is enabled again since it is also | 3378 | ** On NS multicolor font display is enabled again since it is also |
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index c9722aa8553..4ce8e9b1c2c 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS | |||
| @@ -92,7 +92,7 @@ the message to 30 characters in order to build the description of the | |||
| 92 | link. This behavior was considered as too surprising. As | 92 | link. This behavior was considered as too surprising. As |
| 93 | a consequence, Org no longer truncates subjects. | 93 | a consequence, Org no longer truncates subjects. |
| 94 | 94 | ||
| 95 | You can get the old behaviour back with the following: | 95 | You can get the old behavior back with the following: |
| 96 | 96 | ||
| 97 | : (setq org-email-link-description-format "Email %c: %.30s") | 97 | : (setq org-email-link-description-format "Email %c: %.30s") |
| 98 | 98 | ||
| @@ -170,7 +170,7 @@ From now on inheritance requires no extra property and will adhere to | |||
| 170 | customized to always be activated or never be activated in | 170 | customized to always be activated or never be activated in |
| 171 | ~org-attach-use-inheritance~. | 171 | ~org-attach-use-inheritance~. |
| 172 | 172 | ||
| 173 | The ATTACH_DIR property is deprecated in favour of the shorter | 173 | The ATTACH_DIR property is deprecated in favor of the shorter |
| 174 | property DIR. Links to folders inside the DIR property can now be | 174 | property DIR. Links to folders inside the DIR property can now be |
| 175 | declared as relative links. This is not enabled by default, but can | 175 | declared as relative links. This is not enabled by default, but can |
| 176 | be set in ~org-attach-dir-relative~. | 176 | be set in ~org-attach-dir-relative~. |
| @@ -178,7 +178,7 @@ be set in ~org-attach-dir-relative~. | |||
| 178 | When adding new attachment to the outline node the preferred way of | 178 | When adding new attachment to the outline node the preferred way of |
| 179 | doing so can be customized. Take a look at | 179 | doing so can be customized. Take a look at |
| 180 | ~org-attach-preferred-new-method~. It defaults to using ID since that | 180 | ~org-attach-preferred-new-method~. It defaults to using ID since that |
| 181 | was the behaviour before this change. | 181 | was the behavior before this change. |
| 182 | 182 | ||
| 183 | If both DIR and ID properties are set on the same node, DIR has | 183 | If both DIR and ID properties are set on the same node, DIR has |
| 184 | precedence and will be used. | 184 | precedence and will be used. |
| @@ -335,7 +335,7 @@ parameters in ~sql-connection-alist~. | |||
| 335 | The builtin "latex" exporters now accept and use a =:scale= attribute, | 335 | The builtin "latex" exporters now accept and use a =:scale= attribute, |
| 336 | which scales an image by a given factor. | 336 | which scales an image by a given factor. |
| 337 | 337 | ||
| 338 | This attribute is wrapped adound the =scale= parameter of LaTeX's | 338 | This attribute is wrapped around the =scale= parameter of LaTeX's |
| 339 | =\includegraphics= (bitmap images) or a TiKZ's =\scalebox=. | 339 | =\includegraphics= (bitmap images) or a TiKZ's =\scalebox=. |
| 340 | Therefore, its value should be some string palatable to LaTeX as | 340 | Therefore, its value should be some string palatable to LaTeX as |
| 341 | a positive float Its default value is an empty string (i.e. disabled). | 341 | a positive float Its default value is an empty string (i.e. disabled). |
| @@ -386,7 +386,7 @@ You can install it back from MELPA. | |||
| 386 | *** ~org-capture-insert-template-here~ | 386 | *** ~org-capture-insert-template-here~ |
| 387 | *** ~org-attach-directory~ | 387 | *** ~org-attach-directory~ |
| 388 | 388 | ||
| 389 | It has been deprecated in favour of ~org-attach-id-dir~ which is less | 389 | It has been deprecated in favor of ~org-attach-id-dir~ which is less |
| 390 | ambiguous given the restructured org-attach. | 390 | ambiguous given the restructured org-attach. |
| 391 | 391 | ||
| 392 | *** ~org-enable-fixed-width-editor~ | 392 | *** ~org-enable-fixed-width-editor~ |
| @@ -612,7 +612,7 @@ document, use =shrink= value instead, or in addition to align: | |||
| 612 | 612 | ||
| 613 | Function ~org-get-tags~ used to return local tags to the current | 613 | Function ~org-get-tags~ used to return local tags to the current |
| 614 | headline. It now returns all the inherited tags in addition to the | 614 | headline. It now returns all the inherited tags in addition to the |
| 615 | local tags. In order to get the old behaviour back, you can use: | 615 | local tags. In order to get the old behavior back, you can use: |
| 616 | 616 | ||
| 617 | : (org-get-tags nil t) | 617 | : (org-get-tags nil t) |
| 618 | 618 | ||
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index 749e7f68b6c..4d762d517ec 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 | |||
| @@ -7912,7 +7912,7 @@ | |||
| 7912 | 7912 | ||
| 7913 | * simple.el (choose-completion): Check for | 7913 | * simple.el (choose-completion): Check for |
| 7914 | next-single-property-change returning nil. | 7914 | next-single-property-change returning nil. |
| 7915 | * mouse.el (mouse-choose-completion): Dito. | 7915 | * mouse.el (mouse-choose-completion): Ditto. |
| 7916 | 7916 | ||
| 7917 | 1994-07-28 Richard Stallman <rms@mole.gnu.ai.mit.edu> | 7917 | 1994-07-28 Richard Stallman <rms@mole.gnu.ai.mit.edu> |
| 7918 | 7918 | ||
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index cd090533b0b..27d19d93046 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 | |||
| @@ -618,7 +618,7 @@ | |||
| 618 | 1999-12-12 Martin Stjernholm <mast@lysator.liu.se> | 618 | 1999-12-12 Martin Stjernholm <mast@lysator.liu.se> |
| 619 | 619 | ||
| 620 | Changes for new style variable init system: | 620 | Changes for new style variable init system: |
| 621 | * cc-langs.el (c-common-init): Dito. | 621 | * cc-langs.el (c-common-init): Ditto. |
| 622 | * cc-styles.el: c-offsets-alist moved to cc-vars.el since it's | 622 | * cc-styles.el: c-offsets-alist moved to cc-vars.el since it's |
| 623 | now customizable. | 623 | now customizable. |
| 624 | * cc-vars.el: Style variables may now take a value | 624 | * cc-vars.el: Style variables may now take a value |
diff --git a/lisp/char-fold.el b/lisp/char-fold.el index d8d2ebc72ba..2b0b5b62f4d 100644 --- a/lisp/char-fold.el +++ b/lisp/char-fold.el | |||
| @@ -253,7 +253,7 @@ Each entry is a list of a character and the strings that fold into it." | |||
| 253 | :version "27.1") | 253 | :version "27.1") |
| 254 | 254 | ||
| 255 | (defcustom char-fold-exclude char-fold--default-exclude | 255 | (defcustom char-fold-exclude char-fold--default-exclude |
| 256 | "Character foldings to remove from default decompisitions. | 256 | "Character foldings to remove from default decompositions. |
| 257 | Each entry is a list of a character and the strings to remove from folding." | 257 | Each entry is a list of a character and the strings to remove from folding." |
| 258 | :type '(alist :key-type (character :tag "Fold to character") | 258 | :type '(alist :key-type (character :tag "Fold to character") |
| 259 | :value-type (repeat (string :tag "Fold from string"))) | 259 | :value-type (repeat (string :tag "Fold from string"))) |
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index f3cbee70486..37a73281c23 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el | |||
| @@ -230,7 +230,7 @@ inside a comment or string." | |||
| 230 | (electric-pair-mode nil) | 230 | (electric-pair-mode nil) |
| 231 | ;; When adding the "closer" delimiter, a job his function is | 231 | ;; When adding the "closer" delimiter, a job his function is |
| 232 | ;; frequently used for, we don't want to munch any extra | 232 | ;; frequently used for, we don't want to munch any extra |
| 233 | ;; newlines above us. That would be the default behaviour of | 233 | ;; newlines above us. That would be the default behavior of |
| 234 | ;; `electric-layout-mode', which potentially kicked in before | 234 | ;; `electric-layout-mode', which potentially kicked in before |
| 235 | ;; us to add these newlines, and is probably about to kick in | 235 | ;; us to add these newlines, and is probably about to kick in |
| 236 | ;; again after we add the closer. | 236 | ;; again after we add the closer. |
diff --git a/lisp/electric.el b/lisp/electric.el index a14deb71afb..7b683347175 100644 --- a/lisp/electric.el +++ b/lisp/electric.el | |||
| @@ -423,10 +423,10 @@ If multiple rules match, only first one is executed.") | |||
| 423 | ;; newlines, re-indentation is prevented. | 423 | ;; newlines, re-indentation is prevented. |
| 424 | ;; | 424 | ;; |
| 425 | ;; FIXME: when `newline'ing, we exceptionally | 425 | ;; FIXME: when `newline'ing, we exceptionally |
| 426 | ;; prevent a specific behaviour of | 426 | ;; prevent a specific behavior of |
| 427 | ;; `eletric-pair-mode', that of opening an extra | 427 | ;; `eletric-pair-mode', that of opening an extra |
| 428 | ;; newline between newly inserted matching paris. | 428 | ;; newline between newly inserted matching paris. |
| 429 | ;; In theory that behaviour should be provided by | 429 | ;; In theory that behavior should be provided by |
| 430 | ;; `electric-layout-mode' instead, which should be | 430 | ;; `electric-layout-mode' instead, which should be |
| 431 | ;; possible given the current API. | 431 | ;; possible given the current API. |
| 432 | ;; | 432 | ;; |
diff --git a/lisp/emacs-lisp/backtrace.el b/lisp/emacs-lisp/backtrace.el index 0c4c7987c3c..40784893391 100644 --- a/lisp/emacs-lisp/backtrace.el +++ b/lisp/emacs-lisp/backtrace.el | |||
| @@ -709,7 +709,7 @@ line and recenter window line accordingly." | |||
| 709 | (defun backtrace-print-to-string (obj &optional limit) | 709 | (defun backtrace-print-to-string (obj &optional limit) |
| 710 | "Return a printed representation of OBJ formatted for backtraces. | 710 | "Return a printed representation of OBJ formatted for backtraces. |
| 711 | Attempt to get the length of the returned string under LIMIT | 711 | Attempt to get the length of the returned string under LIMIT |
| 712 | charcters with appropriate settings of `print-level' and | 712 | characters with appropriate settings of `print-level' and |
| 713 | `print-length.' LIMIT defaults to `backtrace-line-length'." | 713 | `print-length.' LIMIT defaults to `backtrace-line-length'." |
| 714 | (backtrace--with-output-variables backtrace-view | 714 | (backtrace--with-output-variables backtrace-view |
| 715 | (backtrace--print-to-string obj limit))) | 715 | (backtrace--print-to-string obj limit))) |
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 0dc6e198663..a92c613b9aa 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el | |||
| @@ -275,7 +275,7 @@ Return (REGEXP . PRECEDENCE)." | |||
| 275 | ;; -> "[A-Z@%[:digit:][:space:][:word:]]" | 275 | ;; -> "[A-Z@%[:digit:][:space:][:word:]]" |
| 276 | ;; | 276 | ;; |
| 277 | ;; Problem: If a subpattern is carefully written to be | 277 | ;; Problem: If a subpattern is carefully written to be |
| 278 | ;; optimisable by regexp-opt, how do we prevent the transforms | 278 | ;; optimizable by regexp-opt, how do we prevent the transforms |
| 279 | ;; above from destroying that property? | 279 | ;; above from destroying that property? |
| 280 | ;; Example: (or "a" (or "abc" "abd" "abe")) | 280 | ;; Example: (or "a" (or "abc" "abd" "abe")) |
| 281 | (cond | 281 | (cond |
diff --git a/lisp/faces.el b/lisp/faces.el index 0f31628f5f9..df15764cc4a 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -1773,7 +1773,7 @@ If FRAME is nil, that stands for the selected frame." | |||
| 1773 | (defun defined-colors-with-face-attributes (&optional frame) | 1773 | (defun defined-colors-with-face-attributes (&optional frame) |
| 1774 | "Return a list of colors supported for a particular frame. | 1774 | "Return a list of colors supported for a particular frame. |
| 1775 | See `defined-colors' for arguments and return value. In contrast | 1775 | See `defined-colors' for arguments and return value. In contrast |
| 1776 | to `define-colorss' the elements of the returned list are color | 1776 | to `define-colors' the elements of the returned list are color |
| 1777 | strings with text properties, that make the color names render | 1777 | strings with text properties, that make the color names render |
| 1778 | with the color they represent as background color." | 1778 | with the color they represent as background color." |
| 1779 | (mapcar | 1779 | (mapcar |
diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 01c19e6e874..c20b410a687 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el | |||
| @@ -1101,7 +1101,7 @@ accessible portion of the current buffer." | |||
| 1101 | Called with two arguments BEG and END.") | 1101 | Called with two arguments BEG and END.") |
| 1102 | 1102 | ||
| 1103 | (defun font-lock-debug-fontify () | 1103 | (defun font-lock-debug-fontify () |
| 1104 | "Reinitialise the font-lock machinery and (re-)fontify the buffer. | 1104 | "Reinitialize the font-lock machinery and (re-)fontify the buffer. |
| 1105 | This functions is a convenience functions when developing font | 1105 | This functions is a convenience functions when developing font |
| 1106 | locking for a mode, and is not meant to be called from lisp functions." | 1106 | locking for a mode, and is not meant to be called from lisp functions." |
| 1107 | (interactive) | 1107 | (interactive) |
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index cfb185b3d1c..5745bf12bde 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el | |||
| @@ -2088,7 +2088,7 @@ you're expecting some kind of apostrophe or quotation mark, then | |||
| 2088 | try this wash." | 2088 | try this wash." |
| 2089 | (interactive) | 2089 | (interactive) |
| 2090 | (article-translate-strings gnus-article-smartquotes-map)) | 2090 | (article-translate-strings gnus-article-smartquotes-map)) |
| 2091 | (define-obsolete-function-alias 'article-treat-dumquotes | 2091 | (define-obsolete-function-alias 'article-treat-dumbquotes |
| 2092 | #'article-treat-smartquotes "27.1") | 2092 | #'article-treat-smartquotes "27.1") |
| 2093 | 2093 | ||
| 2094 | (defvar org-entities) | 2094 | (defvar org-entities) |
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el index 40a067e6251..8aa5f16083e 100644 --- a/lisp/net/goto-addr.el +++ b/lisp/net/goto-addr.el | |||
| @@ -100,7 +100,7 @@ A value of t means there is no limit--fontify regardless of the size." | |||
| 100 | '("mailto:" "data:") | 100 | '("mailto:" "data:") |
| 101 | "List of URI schemes to exclude from `goto-address-uri-schemes'. | 101 | "List of URI schemes to exclude from `goto-address-uri-schemes'. |
| 102 | 102 | ||
| 103 | Customisations to this variable made after goto-addr is loaded | 103 | Customizations to this variable made after goto-addr is loaded |
| 104 | will have no effect.") | 104 | will have no effect.") |
| 105 | 105 | ||
| 106 | (defvar goto-address-uri-schemes | 106 | (defvar goto-address-uri-schemes |
| @@ -111,7 +111,7 @@ will have no effect.") | |||
| 111 | (copy-sequence thing-at-point-uri-schemes)) | 111 | (copy-sequence thing-at-point-uri-schemes)) |
| 112 | "List of URI schemes matched by `goto-address-url-regexp'. | 112 | "List of URI schemes matched by `goto-address-url-regexp'. |
| 113 | 113 | ||
| 114 | Customisations to this variable made after goto-addr is loaded | 114 | Customizations to this variable made after goto-addr is loaded |
| 115 | will have no effect.") | 115 | will have no effect.") |
| 116 | 116 | ||
| 117 | (defvar goto-address-url-regexp | 117 | (defvar goto-address-url-regexp |
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index 5dc5244e6d5..e430daa3823 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el | |||
| @@ -384,7 +384,7 @@ Security (DTLS)\", \"(4.1. General Guidelines)\" | |||
| 384 | This check is a response to Logjam[1]. Logjam is an attack that | 384 | This check is a response to Logjam[1]. Logjam is an attack that |
| 385 | allows an attacker with sufficient resource, and positioned | 385 | allows an attacker with sufficient resource, and positioned |
| 386 | between the user and the server, to downgrade vulnerable TLS | 386 | between the user and the server, to downgrade vulnerable TLS |
| 387 | connections to insecure 512-bit export grade crypotography. | 387 | connections to insecure 512-bit export grade cryptography. |
| 388 | 388 | ||
| 389 | The Logjam paper suggests using 1024-bit prime on the client to | 389 | The Logjam paper suggests using 1024-bit prime on the client to |
| 390 | mitigate some effects of this attack, and upgrade to 2048-bit as | 390 | mitigate some effects of this attack, and upgrade to 2048-bit as |
| @@ -550,7 +550,7 @@ Security (TLS) and Datagram Transport Layer Security (DTLS)\", | |||
| 550 | Due to its use of 64-bit block size, it is known that a | 550 | Due to its use of 64-bit block size, it is known that a |
| 551 | ciphertext collision is highly likely when 2^32 blocks are | 551 | ciphertext collision is highly likely when 2^32 blocks are |
| 552 | encrypted with the same key bundle under 3-key 3DES. Practical | 552 | encrypted with the same key bundle under 3-key 3DES. Practical |
| 553 | birthday attacks of this kind have been demostrated by Sweet32[1]. | 553 | birthday attacks of this kind have been demonstrated by Sweet32[1]. |
| 554 | As such, NIST is in the process of disallowing its use in TLS[2]. | 554 | As such, NIST is in the process of disallowing its use in TLS[2]. |
| 555 | 555 | ||
| 556 | [1]: Bhargavan, Leurent (2016). \"On the Practical (In-)Security of | 556 | [1]: Bhargavan, Leurent (2016). \"On the Practical (In-)Security of |
| @@ -752,7 +752,7 @@ protocol." | |||
| 752 | ;; Plain connection allowed. | 752 | ;; Plain connection allowed. |
| 753 | (memq :none saved-fingerprints) | 753 | (memq :none saved-fingerprints) |
| 754 | ;; We are pinning certs, and we have seen this host before, | 754 | ;; We are pinning certs, and we have seen this host before, |
| 755 | ;; but the credientials for this host differs from the last | 755 | ;; but the credentials for this host differs from the last |
| 756 | ;; times we saw it. | 756 | ;; times we saw it. |
| 757 | (member (nsm-fingerprint status) saved-fingerprints)))) | 757 | (member (nsm-fingerprint status) saved-fingerprints)))) |
| 758 | 758 | ||
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el index 96b11c7f524..607b0257206 100644 --- a/lisp/net/tramp-cmds.el +++ b/lisp/net/tramp-cmds.el | |||
| @@ -359,7 +359,7 @@ The remote connection identified by SOURCE is flushed by | |||
| 359 | ;; Append local file name if none is specified. | 359 | ;; Append local file name if none is specified. |
| 360 | (when (string-equal (file-remote-p target) target) | 360 | (when (string-equal (file-remote-p target) target) |
| 361 | (setq target (concat target (file-remote-p source 'localname)))) | 361 | (setq target (concat target (file-remote-p source 'localname)))) |
| 362 | ;; Make them directoy names. | 362 | ;; Make them directory names. |
| 363 | (setq source (directory-file-name source) | 363 | (setq source (directory-file-name source) |
| 364 | target (directory-file-name target)) | 364 | target (directory-file-name target)) |
| 365 | 365 | ||
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 2404ca43dcb..2f0bd5f4e17 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el | |||
| @@ -7636,7 +7636,7 @@ and deselects entries with tag `John' or matching the regexp `plot'. | |||
| 7636 | 7636 | ||
| 7637 | During entry of the filter, completion for tags, categories and effort | 7637 | During entry of the filter, completion for tags, categories and effort |
| 7638 | values is offered. Since the syntax for categories and tags is identical | 7638 | values is offered. Since the syntax for categories and tags is identical |
| 7639 | there should be no overlap between categoroes and tags. If there is, tags | 7639 | there should be no overlap between categories and tags. If there is, tags |
| 7640 | get priority. | 7640 | get priority. |
| 7641 | 7641 | ||
| 7642 | A single `\\[universal-argument]' prefix arg STRIP-OR-ACCUMULATE will negate the | 7642 | A single `\\[universal-argument]' prefix arg STRIP-OR-ACCUMULATE will negate the |
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 5f42db50688..a2e77e07392 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el | |||
| @@ -1709,7 +1709,7 @@ The function assumes `org-table-copy-increment' is non-nil." | |||
| 1709 | (number-suffix-regexp (rx (and (one-or-more digit) string-end))) | 1709 | (number-suffix-regexp (rx (and (one-or-more digit) string-end))) |
| 1710 | (analyze | 1710 | (analyze |
| 1711 | (lambda (field) | 1711 | (lambda (field) |
| 1712 | ;; Analyse string FIELD and return information related to | 1712 | ;; Analyze string FIELD and return information related to |
| 1713 | ;; increment or nil. When non-nil, return value has the | 1713 | ;; increment or nil. When non-nil, return value has the |
| 1714 | ;; following scheme: (TYPE VALUE PATTERN) where | 1714 | ;; following scheme: (TYPE VALUE PATTERN) where |
| 1715 | ;; - TYPE is a symbol among `number', `prefix', `suffix' | 1715 | ;; - TYPE is a symbol among `number', `prefix', `suffix' |
diff --git a/lisp/org/org.el b/lisp/org/org.el index f25c53caaff..11bc3641022 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -10008,7 +10008,7 @@ By default the available states are \"TODO\" and \"DONE\". So, for this | |||
| 10008 | example: when the item starts with TODO, it is changed to DONE. | 10008 | example: when the item starts with TODO, it is changed to DONE. |
| 10009 | When it starts with DONE, the DONE is removed. And when neither TODO nor | 10009 | When it starts with DONE, the DONE is removed. And when neither TODO nor |
| 10010 | DONE are present, add TODO at the beginning of the heading. | 10010 | DONE are present, add TODO at the beginning of the heading. |
| 10011 | You can set up single-charcter keys to fast-select the new state. See the | 10011 | You can set up single-character keys to fast-select the new state. See the |
| 10012 | `org-todo-keywords' and `org-use-fast-todo-selection' for details. | 10012 | `org-todo-keywords' and `org-use-fast-todo-selection' for details. |
| 10013 | 10013 | ||
| 10014 | With `\\[universal-argument]' prefix ARG, force logging the state change \ | 10014 | With `\\[universal-argument]' prefix ARG, force logging the state change \ |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 1b3b92deaf5..0eed7acd0d7 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -3737,9 +3737,9 @@ Pdbtracking would open the file for current stack frame found in pdb output by | |||
| 3737 | `python-pdbtrack-stacktrace-info-regexp' and add overlay arrow in currently | 3737 | `python-pdbtrack-stacktrace-info-regexp' and add overlay arrow in currently |
| 3738 | inspected line in that file. | 3738 | inspected line in that file. |
| 3739 | 3739 | ||
| 3740 | After command listed in `python-pdbtrack-continue-command' or | 3740 | After the command listed in `python-pdbtrack-continue-command' or |
| 3741 | `python-pdbtrack-exit-command' is sent to pdb, pdbtracking session is | 3741 | `python-pdbtrack-exit-command' is sent to pdb, the pdbtracking session is |
| 3742 | considered over. Overlay arrow will be removed from currentry tracked | 3742 | considered over. The overlay arrow will be removed from the currently tracked |
| 3743 | buffer. Additionally, if `python-pdbtrack-kill-buffers' is non-nil, all | 3743 | buffer. Additionally, if `python-pdbtrack-kill-buffers' is non-nil, all |
| 3744 | files opened by pdbtracking will be killed." | 3744 | files opened by pdbtracking will be killed." |
| 3745 | :type 'boolean | 3745 | :type 'boolean |
diff --git a/lisp/simple.el b/lisp/simple.el index a0250cc2ac4..6d5030073bb 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -50,7 +50,7 @@ wait this many seconds after Emacs becomes idle before doing an update." | |||
| 50 | The `undo' command will normally consider \"similar\" changes | 50 | The `undo' command will normally consider \"similar\" changes |
| 51 | (like inserting characters) to be part of the same change. This | 51 | (like inserting characters) to be part of the same change. This |
| 52 | is called \"amalgamating\" the changes. This variable says what | 52 | is called \"amalgamating\" the changes. This variable says what |
| 53 | the maximum number of changes condidered is when amalgamating. A | 53 | the maximum number of changes considered is when amalgamating. A |
| 54 | value of 1 means that nothing is amalgamated.") | 54 | value of 1 means that nothing is amalgamated.") |
| 55 | 55 | ||
| 56 | (defgroup killing nil | 56 | (defgroup killing nil |
diff --git a/lisp/so-long.el b/lisp/so-long.el index 49595a3fd91..3df2de97297 100644 --- a/lisp/so-long.el +++ b/lisp/so-long.el | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | ;; compacted into the smallest file size possible, which often entails removing | 38 | ;; compacted into the smallest file size possible, which often entails removing |
| 39 | ;; newlines should they not be strictly necessary). This can result in lines | 39 | ;; newlines should they not be strictly necessary). This can result in lines |
| 40 | ;; which are many thousands of characters long, and most programming modes | 40 | ;; which are many thousands of characters long, and most programming modes |
| 41 | ;; simply aren't optimised (remotely) for this scenario, so performance can | 41 | ;; simply aren't optimized (remotely) for this scenario, so performance can |
| 42 | ;; suffer significantly. | 42 | ;; suffer significantly. |
| 43 | ;; | 43 | ;; |
| 44 | ;; When such files are detected, the command `so-long' is automatically called, | 44 | ;; When such files are detected, the command `so-long' is automatically called, |
| @@ -90,7 +90,7 @@ | |||
| 90 | ;; * Overview of modes and commands | 90 | ;; * Overview of modes and commands |
| 91 | ;; -------------------------------- | 91 | ;; -------------------------------- |
| 92 | ;; - `global-so-long-mode' - A global minor mode which enables the automated | 92 | ;; - `global-so-long-mode' - A global minor mode which enables the automated |
| 93 | ;; behaviour, causing the user's preferred action to be invoked whenever a | 93 | ;; behavior, causing the user's preferred action to be invoked whenever a |
| 94 | ;; newly-visited file contains excessively long lines. | 94 | ;; newly-visited file contains excessively long lines. |
| 95 | ;; - `so-long-mode' - A major mode, and the default action. | 95 | ;; - `so-long-mode' - A major mode, and the default action. |
| 96 | ;; - `so-long-minor-mode' - A minor mode version of the major mode, and an | 96 | ;; - `so-long-minor-mode' - A minor mode version of the major mode, and an |
| @@ -111,7 +111,7 @@ | |||
| 111 | ;; | 111 | ;; |
| 112 | ;; On rare occasions you may choose to manually invoke the `so-long' command, | 112 | ;; On rare occasions you may choose to manually invoke the `so-long' command, |
| 113 | ;; which invokes your preferred `so-long-action' (exactly as the automatic | 113 | ;; which invokes your preferred `so-long-action' (exactly as the automatic |
| 114 | ;; behaviour would do if it had detected long lines). You might use this if a | 114 | ;; behavior would do if it had detected long lines). You might use this if a |
| 115 | ;; problematic file did not meet your configured criteria, and you wished to | 115 | ;; problematic file did not meet your configured criteria, and you wished to |
| 116 | ;; trigger the performance improvements manually. | 116 | ;; trigger the performance improvements manually. |
| 117 | ;; | 117 | ;; |
| @@ -120,7 +120,7 @@ | |||
| 120 | ;; available to `so-long' but, like any other mode, they can be invoked directly | 120 | ;; available to `so-long' but, like any other mode, they can be invoked directly |
| 121 | ;; if you have a need to do that (see also "Other ways of using so-long" below). | 121 | ;; if you have a need to do that (see also "Other ways of using so-long" below). |
| 122 | ;; | 122 | ;; |
| 123 | ;; If the behaviour ever triggers when you did not want it to, you can use the | 123 | ;; If the behavior ever triggers when you did not want it to, you can use the |
| 124 | ;; `so-long-revert' command to restore the buffer to its original state. | 124 | ;; `so-long-revert' command to restore the buffer to its original state. |
| 125 | 125 | ||
| 126 | ;; * Basic configuration | 126 | ;; * Basic configuration |
| @@ -199,7 +199,7 @@ | |||
| 199 | ;; | 199 | ;; |
| 200 | ;; Note that `so-long-minor-modes' is not useful for other global minor modes | 200 | ;; Note that `so-long-minor-modes' is not useful for other global minor modes |
| 201 | ;; (as distinguished from globalized minor modes), but in some cases it will be | 201 | ;; (as distinguished from globalized minor modes), but in some cases it will be |
| 202 | ;; possible to inhibit or otherwise counter-act the behaviour of a global mode | 202 | ;; possible to inhibit or otherwise counter-act the behavior of a global mode |
| 203 | ;; by overriding variables, or by employing hooks (see below). You would need | 203 | ;; by overriding variables, or by employing hooks (see below). You would need |
| 204 | ;; to inspect the code for a given global mode (on a case by case basis) to | 204 | ;; to inspect the code for a given global mode (on a case by case basis) to |
| 205 | ;; determine whether it's possible to inhibit it for a single buffer -- and if | 205 | ;; determine whether it's possible to inhibit it for a single buffer -- and if |
| @@ -211,7 +211,7 @@ | |||
| 211 | ;; If `so-long-action' is set to either `so-long-mode' or `so-long-minor-mode', | 211 | ;; If `so-long-action' is set to either `so-long-mode' or `so-long-minor-mode', |
| 212 | ;; the buffer-local value for each variable in the list is set to the associated | 212 | ;; the buffer-local value for each variable in the list is set to the associated |
| 213 | ;; value in the alist. Use this to enforce values which will improve | 213 | ;; value in the alist. Use this to enforce values which will improve |
| 214 | ;; performance or otherwise avoid undesirable behaviours. If `so-long-revert' | 214 | ;; performance or otherwise avoid undesirable behaviors. If `so-long-revert' |
| 215 | ;; is called, then the original values are restored. | 215 | ;; is called, then the original values are restored. |
| 216 | 216 | ||
| 217 | ;; * Hooks | 217 | ;; * Hooks |
| @@ -325,7 +325,7 @@ | |||
| 325 | ;; meaning you would need to add to `safe-local-variable-values' in order to | 325 | ;; meaning you would need to add to `safe-local-variable-values' in order to |
| 326 | ;; avoid being queried about them. | 326 | ;; avoid being queried about them. |
| 327 | ;; | 327 | ;; |
| 328 | ;; Finally, the `so-long-predicate' user option enables the automated behaviour | 328 | ;; Finally, the `so-long-predicate' user option enables the automated behavior |
| 329 | ;; to be determined by a custom function, if greater control is needed. | 329 | ;; to be determined by a custom function, if greater control is needed. |
| 330 | 330 | ||
| 331 | ;; * Implementation notes | 331 | ;; * Implementation notes |
| @@ -342,7 +342,7 @@ | |||
| 342 | 342 | ||
| 343 | ;; * Caveats | 343 | ;; * Caveats |
| 344 | ;; --------- | 344 | ;; --------- |
| 345 | ;; The variables affecting the automated behaviour of this library (such as | 345 | ;; The variables affecting the automated behavior of this library (such as |
| 346 | ;; `so-long-action') can be used as file- or dir-local values in Emacs 26+, but | 346 | ;; `so-long-action') can be used as file- or dir-local values in Emacs 26+, but |
| 347 | ;; not in previous versions of Emacs. This is on account of improvements made | 347 | ;; not in previous versions of Emacs. This is on account of improvements made |
| 348 | ;; to `normal-mode' in 26.1, which altered the execution order with respect to | 348 | ;; to `normal-mode' in 26.1, which altered the execution order with respect to |
| @@ -399,7 +399,7 @@ | |||
| 399 | ;; 0.6 - Added `so-long-minor-modes' and `so-long-hook'. | 399 | ;; 0.6 - Added `so-long-minor-modes' and `so-long-hook'. |
| 400 | ;; 0.5 - Renamed library to "so-long.el". | 400 | ;; 0.5 - Renamed library to "so-long.el". |
| 401 | ;; - Added explicit `so-long-enable' command to activate our advice. | 401 | ;; - Added explicit `so-long-enable' command to activate our advice. |
| 402 | ;; 0.4 - Amended/documented behaviour with file-local 'mode' variables. | 402 | ;; 0.4 - Amended/documented behavior with file-local 'mode' variables. |
| 403 | ;; 0.3 - Defer to a file-local 'mode' variable. | 403 | ;; 0.3 - Defer to a file-local 'mode' variable. |
| 404 | ;; 0.2 - Initial release to EmacsWiki. | 404 | ;; 0.2 - Initial release to EmacsWiki. |
| 405 | ;; 0.1 - Experimental. | 405 | ;; 0.1 - Experimental. |
| @@ -500,7 +500,7 @@ files would prevent Emacs from handling them correctly." | |||
| 500 | (defcustom so-long-invisible-buffer-function #'so-long-deferred | 500 | (defcustom so-long-invisible-buffer-function #'so-long-deferred |
| 501 | "Function called in place of `so-long' when the buffer is not displayed. | 501 | "Function called in place of `so-long' when the buffer is not displayed. |
| 502 | 502 | ||
| 503 | This affects the behaviour of `global-so-long-mode'. | 503 | This affects the behavior of `global-so-long-mode'. |
| 504 | 504 | ||
| 505 | We treat invisible buffers differently from displayed buffers because, in | 505 | We treat invisible buffers differently from displayed buffers because, in |
| 506 | cases where a library is using a buffer for behind-the-scenes processing, | 506 | cases where a library is using a buffer for behind-the-scenes processing, |
| @@ -548,7 +548,7 @@ Defaults to `so-long-detected-long-line-p'." | |||
| 548 | (defun so-long--action-type () | 548 | (defun so-long--action-type () |
| 549 | "Generate a :type for `so-long-action' based on `so-long-action-alist'." | 549 | "Generate a :type for `so-long-action' based on `so-long-action-alist'." |
| 550 | ;; :type seemingly cannot be a form to be evaluated on demand, so we | 550 | ;; :type seemingly cannot be a form to be evaluated on demand, so we |
| 551 | ;; endeavour to keep it up-to-date with `so-long-action-alist' by | 551 | ;; endeavor to keep it up-to-date with `so-long-action-alist' by |
| 552 | ;; calling this from `so-long--action-alist-setter'. | 552 | ;; calling this from `so-long--action-alist-setter'. |
| 553 | `(radio ,@(mapcar (lambda (x) (list 'const :tag (cadr x) (car x))) | 553 | `(radio ,@(mapcar (lambda (x) (list 'const :tag (cadr x) (car x))) |
| 554 | (assq-delete-all nil so-long-action-alist)) | 554 | (assq-delete-all nil so-long-action-alist)) |
| @@ -609,7 +609,7 @@ will be automatically processed; but custom actions can also do these things. | |||
| 609 | The value `longlines-mode' causes that minor mode to be enabled. See | 609 | The value `longlines-mode' causes that minor mode to be enabled. See |
| 610 | longlines.el for more details. | 610 | longlines.el for more details. |
| 611 | 611 | ||
| 612 | Each action likewise determines the behaviour of `so-long-revert'. | 612 | Each action likewise determines the behavior of `so-long-revert'. |
| 613 | 613 | ||
| 614 | If the value is nil, or not defined in `so-long-action-alist', then no action | 614 | If the value is nil, or not defined in `so-long-action-alist', then no action |
| 615 | will be taken." | 615 | will be taken." |
| @@ -756,7 +756,7 @@ By default this happens if `so-long-action' is set to either `so-long-mode' | |||
| 756 | or `so-long-minor-mode'. If `so-long-revert' is subsequently invoked, then the | 756 | or `so-long-minor-mode'. If `so-long-revert' is subsequently invoked, then the |
| 757 | disabled modes are re-enabled by calling them with the numeric argument 1. | 757 | disabled modes are re-enabled by calling them with the numeric argument 1. |
| 758 | 758 | ||
| 759 | `so-long-hook' can be used where more custom behaviour is desired. | 759 | `so-long-hook' can be used where more custom behavior is desired. |
| 760 | 760 | ||
| 761 | Please submit bug reports to recommend additional modes for this list, whether | 761 | Please submit bug reports to recommend additional modes for this list, whether |
| 762 | they are in Emacs core, GNU ELPA, or elsewhere." | 762 | they are in Emacs core, GNU ELPA, or elsewhere." |
| @@ -833,7 +833,7 @@ If nil, no mode line indicator will be displayed." | |||
| 833 | ;; Modes that go slowly and line lengths excessive | 833 | ;; Modes that go slowly and line lengths excessive |
| 834 | ;; Font-lock performance becoming oppressive | 834 | ;; Font-lock performance becoming oppressive |
| 835 | ;; All of my CPU tied up with strings | 835 | ;; All of my CPU tied up with strings |
| 836 | ;; These are a few of my least-favourite things | 836 | ;; These are a few of my least-favorite things |
| 837 | 837 | ||
| 838 | (defvar-local so-long-original-values nil | 838 | (defvar-local so-long-original-values nil |
| 839 | "Alist holding the buffer's original `major-mode' value, and other data. | 839 | "Alist holding the buffer's original `major-mode' value, and other data. |
| @@ -916,7 +916,7 @@ If RESET is non-nil, remove any existing values before storing the new ones." | |||
| 916 | ;; triggered by mouse when some other window is selected. | 916 | ;; triggered by mouse when some other window is selected. |
| 917 | "Revert the current action and invoke the chosen replacement. | 917 | "Revert the current action and invoke the chosen replacement. |
| 918 | 918 | ||
| 919 | This commmand calls `so-long' with the selected action as an argument.") | 919 | This command calls `so-long' with the selected action as an argument.") |
| 920 | sym) | 920 | sym) |
| 921 | :enable (not (and so-long--active | 921 | :enable (not (and so-long--active |
| 922 | (eq ',actionfunc so-long-function) | 922 | (eq ',actionfunc so-long-function) |
| @@ -1129,7 +1129,7 @@ This minor mode is a standard `so-long-action' option." | |||
| 1129 | (if so-long-minor-mode ;; We are enabling the mode. | 1129 | (if so-long-minor-mode ;; We are enabling the mode. |
| 1130 | (progn | 1130 | (progn |
| 1131 | ;; Housekeeping. `so-long-minor-mode' might be invoked directly rather | 1131 | ;; Housekeeping. `so-long-minor-mode' might be invoked directly rather |
| 1132 | ;; than via `so-long', so replicate the necessary behaviours. The minor | 1132 | ;; than via `so-long', so replicate the necessary behaviors. The minor |
| 1133 | ;; mode also cares about whether `so-long' was already active, as we do | 1133 | ;; mode also cares about whether `so-long' was already active, as we do |
| 1134 | ;; not want to remember values which were potentially overridden already. | 1134 | ;; not want to remember values which were potentially overridden already. |
| 1135 | (unless (or so-long--calling so-long--active) | 1135 | (unless (or so-long--calling so-long--active) |
| @@ -1201,9 +1201,9 @@ values), despite potential performance issues, type \\[so-long-revert]. | |||
| 1201 | 1201 | ||
| 1202 | Use \\[so-long-commentary] for more information. | 1202 | Use \\[so-long-commentary] for more information. |
| 1203 | 1203 | ||
| 1204 | Use \\[so-long-customize] to configure the behaviour." | 1204 | Use \\[so-long-customize] to configure the behavior." |
| 1205 | ;; Housekeeping. `so-long-mode' might be invoked directly rather than via | 1205 | ;; Housekeeping. `so-long-mode' might be invoked directly rather than via |
| 1206 | ;; `so-long', so replicate the necessary behaviours. We could use this same | 1206 | ;; `so-long', so replicate the necessary behaviors. We could use this same |
| 1207 | ;; test in `so-long-after-change-major-mode' to run `so-long-hook', but that's | 1207 | ;; test in `so-long-after-change-major-mode' to run `so-long-hook', but that's |
| 1208 | ;; not so obviously the right thing to do, so I've omitted it for now. | 1208 | ;; not so obviously the right thing to do, so I've omitted it for now. |
| 1209 | (unless so-long--calling | 1209 | (unless so-long--calling |
| @@ -1249,7 +1249,7 @@ Use \\[so-long-customize] to configure the behaviour." | |||
| 1249 | This advice acts before `so-long-mode', with the previous mode still active." | 1249 | This advice acts before `so-long-mode', with the previous mode still active." |
| 1250 | (unless (derived-mode-p 'so-long-mode) | 1250 | (unless (derived-mode-p 'so-long-mode) |
| 1251 | ;; Housekeeping. `so-long-mode' might be invoked directly rather than | 1251 | ;; Housekeeping. `so-long-mode' might be invoked directly rather than |
| 1252 | ;; via `so-long', so replicate the necessary behaviours. | 1252 | ;; via `so-long', so replicate the necessary behaviors. |
| 1253 | (unless so-long--calling | 1253 | (unless so-long--calling |
| 1254 | (so-long-remember-all :reset)) | 1254 | (so-long-remember-all :reset)) |
| 1255 | ;; Remember the original major mode, regardless. | 1255 | ;; Remember the original major mode, regardless. |
| @@ -1334,7 +1334,7 @@ This is the `so-long-revert-function' for `so-long-mode'." | |||
| 1334 | ;; Emacs 26+ has already called `hack-local-variables' (during | 1334 | ;; Emacs 26+ has already called `hack-local-variables' (during |
| 1335 | ;; `run-mode-hooks'; provided there was a `buffer-file-name'), but for older | 1335 | ;; `run-mode-hooks'; provided there was a `buffer-file-name'), but for older |
| 1336 | ;; versions we need to call it here. In Emacs 26+ the revised 'HANDLE-MODE' | 1336 | ;; versions we need to call it here. In Emacs 26+ the revised 'HANDLE-MODE' |
| 1337 | ;; argument is set to `no-mode' (being the non-nil-and-non-t behaviour), | 1337 | ;; argument is set to `no-mode' (being the non-nil-and-non-t behavior), |
| 1338 | ;; which we mimic here by binding `so-long--hack-local-variables-no-mode', | 1338 | ;; which we mimic here by binding `so-long--hack-local-variables-no-mode', |
| 1339 | ;; in order to prevent a local 'mode' variable from clobbering the major | 1339 | ;; in order to prevent a local 'mode' variable from clobbering the major |
| 1340 | ;; mode we have just called. | 1340 | ;; mode we have just called. |
| @@ -1371,7 +1371,7 @@ because we do not want to downgrade the major mode in that scenario." | |||
| 1371 | ;; Act only if `so-long-mode' would be enabled by the current action. | 1371 | ;; Act only if `so-long-mode' would be enabled by the current action. |
| 1372 | (when (and (symbolp (so-long-function)) | 1372 | (when (and (symbolp (so-long-function)) |
| 1373 | (provided-mode-derived-p (so-long-function) 'so-long-mode)) | 1373 | (provided-mode-derived-p (so-long-function) 'so-long-mode)) |
| 1374 | ;; Downgrade from `so-long-mode' to the `so-long-minor-mode' behaviour. | 1374 | ;; Downgrade from `so-long-mode' to the `so-long-minor-mode' behavior. |
| 1375 | (setq so-long-function 'turn-on-so-long-minor-mode | 1375 | (setq so-long-function 'turn-on-so-long-minor-mode |
| 1376 | so-long-revert-function 'turn-off-so-long-minor-mode)))) | 1376 | so-long-revert-function 'turn-off-so-long-minor-mode)))) |
| 1377 | 1377 | ||
| @@ -1391,7 +1391,7 @@ and cannot be conveniently intercepted, so we are forced to replicate it here. | |||
| 1391 | 1391 | ||
| 1392 | This special-case code will ultimately be removed from Emacs, as it exists to | 1392 | This special-case code will ultimately be removed from Emacs, as it exists to |
| 1393 | deal with a deprecated feature; but until then we need to replicate it in order | 1393 | deal with a deprecated feature; but until then we need to replicate it in order |
| 1394 | to inhibit our own behaviour in the presence of a header comment `mode' | 1394 | to inhibit our own behavior in the presence of a header comment `mode' |
| 1395 | declaration. | 1395 | declaration. |
| 1396 | 1396 | ||
| 1397 | If a file-local mode is detected in the header comment, then we call the | 1397 | If a file-local mode is detected in the header comment, then we call the |
| @@ -1526,7 +1526,7 @@ by testing the value against `major-mode'; but as we may have changed the | |||
| 1526 | major mode to `so-long-mode' by this point, that protection is insufficient | 1526 | major mode to `so-long-mode' by this point, that protection is insufficient |
| 1527 | and so we need to perform our own test. | 1527 | and so we need to perform our own test. |
| 1528 | 1528 | ||
| 1529 | We likewise need to support an equivalent of the `no-mode' behaviour in 26.1+ | 1529 | We likewise need to support an equivalent of the `no-mode' behavior in 26.1+ |
| 1530 | to ensure that `so-long-mode-revert' will not restore a file-local mode again | 1530 | to ensure that `so-long-mode-revert' will not restore a file-local mode again |
| 1531 | after it has already reverted to the original mode. | 1531 | after it has already reverted to the original mode. |
| 1532 | 1532 | ||
| @@ -1673,7 +1673,7 @@ When such files are detected by `so-long-predicate', we invoke the selected | |||
| 1673 | 1673 | ||
| 1674 | Use \\[so-long-commentary] for more information. | 1674 | Use \\[so-long-commentary] for more information. |
| 1675 | 1675 | ||
| 1676 | Use \\[so-long-customize] to configure the behaviour." | 1676 | Use \\[so-long-customize] to configure the behavior." |
| 1677 | :global t | 1677 | :global t |
| 1678 | :group 'so-long | 1678 | :group 'so-long |
| 1679 | (if global-so-long-mode | 1679 | (if global-so-long-mode |
diff --git a/src/coding.c b/src/coding.c index 5f477cf9473..d9964908dce 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -7333,7 +7333,7 @@ produce_annotation (struct coding_system *coding, ptrdiff_t pos) | |||
| 7333 | the text from the end of the gap (and GPT must be equal to PT). | 7333 | the text from the end of the gap (and GPT must be equal to PT). |
| 7334 | 7334 | ||
| 7335 | When the text is taken from the gap, it can't be at the beginning | 7335 | When the text is taken from the gap, it can't be at the beginning |
| 7336 | of the gap because the new decoded text is progressively acumulated | 7336 | of the gap because the new decoded text is progressively accumulated |
| 7337 | at the beginning of the gap before it gets inserted at PT (this way, | 7337 | at the beginning of the gap before it gets inserted at PT (this way, |
| 7338 | as the output grows, the input shrinks, so we only need to allocate | 7338 | as the output grows, the input shrinks, so we only need to allocate |
| 7339 | enough space for `max(IN, OUT)` instead of `IN + OUT`). | 7339 | enough space for `max(IN, OUT)` instead of `IN + OUT`). |
| @@ -9876,7 +9876,7 @@ encode_string_utf_8 (Lisp_Object string, Lisp_Object buffer, | |||
| 9876 | pure-ASCII; only use NOCOPY non-zero if the caller will only use | 9876 | pure-ASCII; only use NOCOPY non-zero if the caller will only use |
| 9877 | the byte sequence of the decoded result accessed via SDATA or | 9877 | the byte sequence of the decoded result accessed via SDATA or |
| 9878 | SSDATA, and if the original STRING will _not_ be modified after the | 9878 | SSDATA, and if the original STRING will _not_ be modified after the |
| 9879 | decoding. When in dount, always pass NOCOPY as zero. You _have_ | 9879 | decoding. When in doubt, always pass NOCOPY as zero. You _have_ |
| 9880 | been warned! | 9880 | been warned! |
| 9881 | 9881 | ||
| 9882 | If STRING is Qnil, and the original string is passed via STR, NOCOPY | 9882 | If STRING is Qnil, and the original string is passed via STR, NOCOPY |
| @@ -10180,7 +10180,7 @@ DEFUN ("internal-encode-string-utf-8", Finternal_encode_string_utf_8, | |||
| 10180 | int repeat_count; | 10180 | int repeat_count; |
| 10181 | Lisp_Object val; | 10181 | Lisp_Object val; |
| 10182 | 10182 | ||
| 10183 | /* Check arguments. Return Qnil when an argmement is invalid. */ | 10183 | /* Check arguments. Return Qnil when an argument is invalid. */ |
| 10184 | if (! STRINGP (string)) | 10184 | if (! STRINGP (string)) |
| 10185 | return Qnil; | 10185 | return Qnil; |
| 10186 | if (! NILP (buffer) | 10186 | if (! NILP (buffer) |
| @@ -10236,7 +10236,7 @@ DEFUN ("internal-decode-string-utf-8", Finternal_decode_string_utf_8, | |||
| 10236 | int repeat_count; | 10236 | int repeat_count; |
| 10237 | Lisp_Object val; | 10237 | Lisp_Object val; |
| 10238 | 10238 | ||
| 10239 | /* Check arguments. Return Qnil when an argmement is invalid. */ | 10239 | /* Check arguments. Return Qnil when an argument is invalid. */ |
| 10240 | if (! STRINGP (string)) | 10240 | if (! STRINGP (string)) |
| 10241 | return Qnil; | 10241 | return Qnil; |
| 10242 | if (! NILP (buffer) | 10242 | if (! NILP (buffer) |
diff --git a/src/frame.c b/src/frame.c index 486d025e6d6..5468920c357 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -3560,7 +3560,7 @@ window managers may refuse to honor a HEIGHT that is not an integer | |||
| 3560 | multiple of the default frame font height. | 3560 | multiple of the default frame font height. |
| 3561 | 3561 | ||
| 3562 | When called interactively, HEIGHT is the numeric prefix and the | 3562 | When called interactively, HEIGHT is the numeric prefix and the |
| 3563 | currenly selected frame will be set to this height. */) | 3563 | currently selected frame will be set to this height. */) |
| 3564 | (Lisp_Object frame, Lisp_Object height, Lisp_Object pretend, Lisp_Object pixelwise) | 3564 | (Lisp_Object frame, Lisp_Object height, Lisp_Object pretend, Lisp_Object pixelwise) |
| 3565 | { | 3565 | { |
| 3566 | struct frame *f = decode_live_frame (frame); | 3566 | struct frame *f = decode_live_frame (frame); |
| @@ -3589,7 +3589,7 @@ window managers may refuse to honor a WIDTH that is not an integer | |||
| 3589 | multiple of the default frame font width. | 3589 | multiple of the default frame font width. |
| 3590 | 3590 | ||
| 3591 | When called interactively, WIDTH is the numeric prefix and the | 3591 | When called interactively, WIDTH is the numeric prefix and the |
| 3592 | currenly selected frame will be set to this width. */) | 3592 | currently selected frame will be set to this width. */) |
| 3593 | (Lisp_Object frame, Lisp_Object width, Lisp_Object pretend, Lisp_Object pixelwise) | 3593 | (Lisp_Object frame, Lisp_Object width, Lisp_Object pretend, Lisp_Object pixelwise) |
| 3594 | { | 3594 | { |
| 3595 | struct frame *f = decode_live_frame (frame); | 3595 | struct frame *f = decode_live_frame (frame); |
diff --git a/src/hbfont.c b/src/hbfont.c index db10f92e313..5a057c26a1d 100644 --- a/src/hbfont.c +++ b/src/hbfont.c | |||
| @@ -541,7 +541,7 @@ hbfont_shape (Lisp_Object lgstring, Lisp_Object direction) | |||
| 541 | 541 | ||
| 542 | Implementation note: the character codepoint recorded in | 542 | Implementation note: the character codepoint recorded in |
| 543 | each glyph is not really used, except when we display the | 543 | each glyph is not really used, except when we display the |
| 544 | glyphs in descr-text.el. So this is just an aeasthetic | 544 | glyphs in descr-text.el. So this is just an aesthetic |
| 545 | issue. */ | 545 | issue. */ |
| 546 | if (buf_reversed) | 546 | if (buf_reversed) |
| 547 | cluster_offset = to - from; | 547 | cluster_offset = to - from; |
diff --git a/src/nsterm.m b/src/nsterm.m index 52a9830be82..493807b2a45 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -9432,8 +9432,8 @@ syms_of_nsterm (void) | |||
| 9432 | 9432 | ||
| 9433 | DEFVAR_LISP ("ns-alternate-modifier", ns_alternate_modifier, | 9433 | DEFVAR_LISP ("ns-alternate-modifier", ns_alternate_modifier, |
| 9434 | "This variable describes the behavior of the alternate or option key.\n\ | 9434 | "This variable describes the behavior of the alternate or option key.\n\ |
| 9435 | Either SYMBOL, describing the behaviour for any event,\n\ | 9435 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9436 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9436 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9437 | separately for ordinary keys, function keys, and mouse events.\n\ | 9437 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9438 | \n\ | 9438 | \n\ |
| 9439 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ | 9439 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ |
| @@ -9442,8 +9442,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9442 | 9442 | ||
| 9443 | DEFVAR_LISP ("ns-right-alternate-modifier", ns_right_alternate_modifier, | 9443 | DEFVAR_LISP ("ns-right-alternate-modifier", ns_right_alternate_modifier, |
| 9444 | "This variable describes the behavior of the right alternate or option key.\n\ | 9444 | "This variable describes the behavior of the right alternate or option key.\n\ |
| 9445 | Either SYMBOL, describing the behaviour for any event,\n\ | 9445 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9446 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9446 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9447 | separately for ordinary keys, function keys, and mouse events.\n\ | 9447 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9448 | It can also be `left' to use the value of `ns-alternate-modifier' instead.\n\ | 9448 | It can also be `left' to use the value of `ns-alternate-modifier' instead.\n\ |
| 9449 | \n\ | 9449 | \n\ |
| @@ -9453,8 +9453,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9453 | 9453 | ||
| 9454 | DEFVAR_LISP ("ns-command-modifier", ns_command_modifier, | 9454 | DEFVAR_LISP ("ns-command-modifier", ns_command_modifier, |
| 9455 | "This variable describes the behavior of the command key.\n\ | 9455 | "This variable describes the behavior of the command key.\n\ |
| 9456 | Either SYMBOL, describing the behaviour for any event,\n\ | 9456 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9457 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9457 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9458 | separately for ordinary keys, function keys, and mouse events.\n\ | 9458 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9459 | \n\ | 9459 | \n\ |
| 9460 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ | 9460 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ |
| @@ -9463,8 +9463,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9463 | 9463 | ||
| 9464 | DEFVAR_LISP ("ns-right-command-modifier", ns_right_command_modifier, | 9464 | DEFVAR_LISP ("ns-right-command-modifier", ns_right_command_modifier, |
| 9465 | "This variable describes the behavior of the right command key.\n\ | 9465 | "This variable describes the behavior of the right command key.\n\ |
| 9466 | Either SYMBOL, describing the behaviour for any event,\n\ | 9466 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9467 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9467 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9468 | separately for ordinary keys, function keys, and mouse events.\n\ | 9468 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9469 | It can also be `left' to use the value of `ns-command-modifier' instead.\n\ | 9469 | It can also be `left' to use the value of `ns-command-modifier' instead.\n\ |
| 9470 | \n\ | 9470 | \n\ |
| @@ -9474,8 +9474,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9474 | 9474 | ||
| 9475 | DEFVAR_LISP ("ns-control-modifier", ns_control_modifier, | 9475 | DEFVAR_LISP ("ns-control-modifier", ns_control_modifier, |
| 9476 | "This variable describes the behavior of the control key.\n\ | 9476 | "This variable describes the behavior of the control key.\n\ |
| 9477 | Either SYMBOL, describing the behaviour for any event,\n\ | 9477 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9478 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9478 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9479 | separately for ordinary keys, function keys, and mouse events.\n\ | 9479 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9480 | \n\ | 9480 | \n\ |
| 9481 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ | 9481 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ |
| @@ -9484,8 +9484,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9484 | 9484 | ||
| 9485 | DEFVAR_LISP ("ns-right-control-modifier", ns_right_control_modifier, | 9485 | DEFVAR_LISP ("ns-right-control-modifier", ns_right_control_modifier, |
| 9486 | "This variable describes the behavior of the right control key.\n\ | 9486 | "This variable describes the behavior of the right control key.\n\ |
| 9487 | Either SYMBOL, describing the behaviour for any event,\n\ | 9487 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9488 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9488 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9489 | separately for ordinary keys, function keys, and mouse events.\n\ | 9489 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9490 | It can also be `left' to use the value of `ns-control-modifier' instead.\n\ | 9490 | It can also be `left' to use the value of `ns-control-modifier' instead.\n\ |
| 9491 | \n\ | 9491 | \n\ |
| @@ -9495,8 +9495,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9495 | 9495 | ||
| 9496 | DEFVAR_LISP ("ns-function-modifier", ns_function_modifier, | 9496 | DEFVAR_LISP ("ns-function-modifier", ns_function_modifier, |
| 9497 | "This variable describes the behavior of the function (fn) key.\n\ | 9497 | "This variable describes the behavior of the function (fn) key.\n\ |
| 9498 | Either SYMBOL, describing the behaviour for any event,\n\ | 9498 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9499 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9499 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9500 | separately for ordinary keys, function keys, and mouse events.\n\ | 9500 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9501 | \n\ | 9501 | \n\ |
| 9502 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ | 9502 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ |
diff --git a/src/window.h b/src/window.h index 5b9a3140c8f..6dbeae1fecc 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -429,7 +429,7 @@ struct window | |||
| 429 | i.e., always survive Fset_window_buffer. */ | 429 | i.e., always survive Fset_window_buffer. */ |
| 430 | bool_bf fringes_persistent : 1; | 430 | bool_bf fringes_persistent : 1; |
| 431 | 431 | ||
| 432 | /* True if this window's croll bar specifications are persistent, | 432 | /* True if this window's scroll bar specifications are persistent, |
| 433 | i.e., always survive Fset_window_buffer. */ | 433 | i.e., always survive Fset_window_buffer. */ |
| 434 | bool_bf scroll_bars_persistent : 1; | 434 | bool_bf scroll_bars_persistent : 1; |
| 435 | 435 | ||
diff --git a/test/lisp/bookmark-tests.el b/test/lisp/bookmark-tests.el index a774dae89dc..09b1be9b26b 100644 --- a/test/lisp/bookmark-tests.el +++ b/test/lisp/bookmark-tests.el | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | "Bookmark file used for testing.") | 38 | "Bookmark file used for testing.") |
| 39 | 39 | ||
| 40 | (defvar bookmark-tests-example-file | 40 | (defvar bookmark-tests-example-file |
| 41 | ;; We use abbreviate-file-name here to match the behaviour of | 41 | ;; We use abbreviate-file-name here to match the behavior of |
| 42 | ;; `bookmark-buffer-file-name'. | 42 | ;; `bookmark-buffer-file-name'. |
| 43 | (abbreviate-file-name (expand-file-name "example.txt" bookmark-tests-data-dir)) | 43 | (abbreviate-file-name (expand-file-name "example.txt" bookmark-tests-data-dir)) |
| 44 | "Example file used for testing.") | 44 | "Example file used for testing.") |
diff --git a/test/lisp/calc/calc-tests.el b/test/lisp/calc/calc-tests.el index 36a81dc2b71..3f5adceeff1 100644 --- a/test/lisp/calc/calc-tests.el +++ b/test/lisp/calc/calc-tests.el | |||
| @@ -271,7 +271,7 @@ An existing calc stack is reused, otherwise a new one is created." | |||
| 271 | (+ (- (* 2 (var y var-y)) (var x var-x)) (* 3 (var z var-z))) | 271 | (+ (- (* 2 (var y var-y)) (var x var-x)) (* 3 (var z var-z))) |
| 272 | -3)) | 272 | -3)) |
| 273 | '(vec (var x var-x) (var y var-y) (var z var-z))) | 273 | '(vec (var x var-x) (var y var-y) (var z var-z))) |
| 274 | ;; The `float' forms in the result are just artefacts of Calc's | 274 | ;; The `float' forms in the result are just artifacts of Calc's |
| 275 | ;; current solver; it should be fixed to produce exact (integral) | 275 | ;; current solver; it should be fixed to produce exact (integral) |
| 276 | ;; results in this case. | 276 | ;; results in this case. |
| 277 | '(vec (calcFunc-eq (var x var-x) (float 1 0)) | 277 | '(vec (calcFunc-eq (var x var-x) (float 1 0)) |
diff --git a/test/lisp/cedet/semantic-utest-c.el b/test/lisp/cedet/semantic-utest-c.el index 05f8491746d..d65b55cbf8e 100644 --- a/test/lisp/cedet/semantic-utest-c.el +++ b/test/lisp/cedet/semantic-utest-c.el | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | (semantic-fetch-tags)))) | 59 | (semantic-fetch-tags)))) |
| 60 | (when (or (not tags-expected) (not tags-actual)) | 60 | (when (or (not tags-expected) (not tags-actual)) |
| 61 | (message "Tried to find test files in: %s" semantic-utest-c-test-directory) | 61 | (message "Tried to find test files in: %s" semantic-utest-c-test-directory) |
| 62 | (error "Failed: Disovered no tags in test files or test file not found.")) | 62 | (error "Failed: Discovered no tags in test files or test file not found.")) |
| 63 | 63 | ||
| 64 | ;; Now that we have the tags, compare them for SPP accuracy. | 64 | ;; Now that we have the tags, compare them for SPP accuracy. |
| 65 | (dolist (tag tags-actual) | 65 | (dolist (tag tags-actual) |
diff --git a/test/lisp/emacs-lisp/rx-tests.el b/test/lisp/emacs-lisp/rx-tests.el index 26e39f8c8ed..317dae2990b 100644 --- a/test/lisp/emacs-lisp/rx-tests.el +++ b/test/lisp/emacs-lisp/rx-tests.el | |||
| @@ -79,7 +79,7 @@ | |||
| 79 | ;; Range of raw characters, multibyte. | 79 | ;; Range of raw characters, multibyte. |
| 80 | (should (equal (rx (any "Å\211\326-\377\177")) | 80 | (should (equal (rx (any "Å\211\326-\377\177")) |
| 81 | "[\177Å\211\326-\377]")) | 81 | "[\177Å\211\326-\377]")) |
| 82 | ;; Split range; \177-\377ÿ should not be optimised to \177-\377. | 82 | ;; Split range; \177-\377ÿ should not be optimized to \177-\377. |
| 83 | (should (equal (rx (any "\177-\377" ?ÿ)) | 83 | (should (equal (rx (any "\177-\377" ?ÿ)) |
| 84 | "[\177ÿ\200-\377]"))) | 84 | "[\177ÿ\200-\377]"))) |
| 85 | 85 | ||
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el index eca1e3bc7f9..89007aeba8a 100644 --- a/test/lisp/files-tests.el +++ b/test/lisp/files-tests.el | |||
| @@ -1300,7 +1300,7 @@ renaming only, rather than modified in-place." | |||
| 1300 | (should (equal (file-size-human-readable-iec 72528034765) "67.5 GiB"))) | 1300 | (should (equal (file-size-human-readable-iec 72528034765) "67.5 GiB"))) |
| 1301 | 1301 | ||
| 1302 | (ert-deftest files-test-magic-mode-alist-re-baseline () | 1302 | (ert-deftest files-test-magic-mode-alist-re-baseline () |
| 1303 | "Test magic-mode-alist with RE, expected behaviour for match." | 1303 | "Test magic-mode-alist with RE, expected behavior for match." |
| 1304 | (let ((magic-mode-alist '(("my-tag" . text-mode)))) | 1304 | (let ((magic-mode-alist '(("my-tag" . text-mode)))) |
| 1305 | (with-temp-buffer | 1305 | (with-temp-buffer |
| 1306 | (insert "my-tag") | 1306 | (insert "my-tag") |
| @@ -1308,7 +1308,7 @@ renaming only, rather than modified in-place." | |||
| 1308 | (should (eq major-mode 'text-mode))))) | 1308 | (should (eq major-mode 'text-mode))))) |
| 1309 | 1309 | ||
| 1310 | (ert-deftest files-test-magic-mode-alist-re-no-match () | 1310 | (ert-deftest files-test-magic-mode-alist-re-no-match () |
| 1311 | "Test magic-mode-alist with RE, expected behaviour for no match." | 1311 | "Test magic-mode-alist with RE, expected behavior for no match." |
| 1312 | (let ((magic-mode-alist '(("my-tag" . text-mode)))) | 1312 | (let ((magic-mode-alist '(("my-tag" . text-mode)))) |
| 1313 | (with-temp-buffer | 1313 | (with-temp-buffer |
| 1314 | (insert "not-my-tag") | 1314 | (insert "not-my-tag") |
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 09ba928c892..e92bc8fd3ca 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -3168,7 +3168,7 @@ They might differ only in time attributes or directory size." | |||
| 3168 | (when (< start-time | 3168 | (when (< start-time |
| 3169 | (float-time (tramp-compat-file-attribute-modification-time attr2))) | 3169 | (float-time (tramp-compat-file-attribute-modification-time attr2))) |
| 3170 | (setcar (nthcdr 5 attr2) tramp-time-dont-know)) | 3170 | (setcar (nthcdr 5 attr2) tramp-time-dont-know)) |
| 3171 | ;; Status change time. Dito. | 3171 | ;; Status change time. Ditto. |
| 3172 | (when (or (tramp-compat-time-equal-p | 3172 | (when (or (tramp-compat-time-equal-p |
| 3173 | (tramp-compat-file-attribute-status-change-time attr1) | 3173 | (tramp-compat-file-attribute-status-change-time attr1) |
| 3174 | tramp-time-dont-know) | 3174 | tramp-time-dont-know) |
diff --git a/test/lisp/so-long-tests/so-long-tests.el b/test/lisp/so-long-tests/so-long-tests.el index ae834421667..2d5d3163e70 100644 --- a/test/lisp/so-long-tests/so-long-tests.el +++ b/test/lisp/so-long-tests/so-long-tests.el | |||
| @@ -58,7 +58,7 @@ | |||
| 58 | (declare-function so-long-tests-assert-reverted "so-long-tests-helpers") | 58 | (declare-function so-long-tests-assert-reverted "so-long-tests-helpers") |
| 59 | (declare-function so-long-tests-assert-and-revert "so-long-tests-helpers") | 59 | (declare-function so-long-tests-assert-and-revert "so-long-tests-helpers") |
| 60 | 60 | ||
| 61 | ;; Enable the automated behaviour for all tests. | 61 | ;; Enable the automated behavior for all tests. |
| 62 | (global-so-long-mode 1) | 62 | (global-so-long-mode 1) |
| 63 | 63 | ||
| 64 | (ert-deftest so-long-tests-threshold-under () | 64 | (ert-deftest so-long-tests-threshold-under () |
| @@ -180,7 +180,7 @@ | |||
| 180 | ;; From Emacs 27 the `display-buffer' call is insufficient. | 180 | ;; From Emacs 27 the `display-buffer' call is insufficient. |
| 181 | ;; The various 'window change functions' are now invoked by the | 181 | ;; The various 'window change functions' are now invoked by the |
| 182 | ;; redisplay, and redisplay does nothing at all in batch mode, | 182 | ;; redisplay, and redisplay does nothing at all in batch mode, |
| 183 | ;; so we cannot test under this revised behaviour. Refer to: | 183 | ;; so we cannot test under this revised behavior. Refer to: |
| 184 | ;; https://lists.gnu.org/archive/html/emacs-devel/2019-10/msg00971.html | 184 | ;; https://lists.gnu.org/archive/html/emacs-devel/2019-10/msg00971.html |
| 185 | ;; For interactive (non-batch) test runs, calling `redisplay' | 185 | ;; For interactive (non-batch) test runs, calling `redisplay' |
| 186 | ;; does do the trick; so do that first. | 186 | ;; does do the trick; so do that first. |
diff --git a/test/lisp/so-long-tests/spelling-tests.el b/test/lisp/so-long-tests/spelling-tests.el index d5bae1ef0ce..47707f979aa 100644 --- a/test/lisp/so-long-tests/spelling-tests.el +++ b/test/lisp/so-long-tests/spelling-tests.el | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | (unwind-protect | 57 | (unwind-protect |
| 58 | (cl-letf (((symbol-function 'ispell-command-loop) | 58 | (cl-letf (((symbol-function 'ispell-command-loop) |
| 59 | (lambda (_miss _guess word _start _end) | 59 | (lambda (_miss _guess word _start _end) |
| 60 | (message "Unrecognised word: %s." word) | 60 | (message "Unrecognized word: %s." word) |
| 61 | (throw 'mistake t)))) | 61 | (throw 'mistake t)))) |
| 62 | (catch 'mistake | 62 | (catch 'mistake |
| 63 | (find-library "so-long") | 63 | (find-library "so-long") |
diff --git a/test/manual/cedet/tests/testusing.cpp b/test/manual/cedet/tests/testusing.cpp index 1208c81fc36..0bcf43eaae8 100644 --- a/test/manual/cedet/tests/testusing.cpp +++ b/test/manual/cedet/tests/testusing.cpp | |||
| @@ -168,7 +168,7 @@ void func8() | |||
| 168 | ; //#10# ( "four" "three" ) | 168 | ; //#10# ( "four" "three" ) |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | // Check convetional namespace aliases | 171 | // Check conventional namespace aliases |
| 172 | // - fully qualified - | 172 | // - fully qualified - |
| 173 | void func9() | 173 | void func9() |
| 174 | { | 174 | { |
diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el index 4ab99c131d0..5fd37520f70 100644 --- a/test/src/buffer-tests.el +++ b/test/src/buffer-tests.el | |||
| @@ -646,7 +646,7 @@ with parameters from the *Messages* buffer modification." | |||
| 646 | (deftest-overlays-at-1 R 50 (a) (a 1 60) (c 1 1) (b 30 30) (d 50 50)) | 646 | (deftest-overlays-at-1 R 50 (a) (a 1 60) (c 1 1) (b 30 30) (d 50 50)) |
| 647 | (deftest-overlays-at-1 S 60 () (a 1 60) (c 1 1) (b 30 30) (d 50 50)) | 647 | (deftest-overlays-at-1 S 60 () (a 1 60) (c 1 1) (b 30 30) (d 50 50)) |
| 648 | 648 | ||
| 649 | ;; behaviour at point-min and point-max | 649 | ;; behavior at point-min and point-max |
| 650 | (ert-deftest test-overlays-at-2 () | 650 | (ert-deftest test-overlays-at-2 () |
| 651 | (cl-macrolet ((should-length (n list) | 651 | (cl-macrolet ((should-length (n list) |
| 652 | `(should (= ,n (length ,list))))) | 652 | `(should (= ,n (length ,list))))) |
| @@ -743,7 +743,7 @@ with parameters from the *Messages* buffer modification." | |||
| 743 | (deftest-overlays-in-1 af 10 11 (a) (a 10 10)) | 743 | (deftest-overlays-in-1 af 10 11 (a) (a 10 10)) |
| 744 | 744 | ||
| 745 | 745 | ||
| 746 | ;; behaviour at point-max | 746 | ;; behavior at point-max |
| 747 | (ert-deftest test-overlays-in-2 () | 747 | (ert-deftest test-overlays-in-2 () |
| 748 | (cl-macrolet ((should-length (n list) | 748 | (cl-macrolet ((should-length (n list) |
| 749 | `(should (= ,n (length ,list))))) | 749 | `(should (= ,n (length ,list))))) |
diff --git a/test/src/casefiddle-tests.el b/test/src/casefiddle-tests.el index 54793f2cda4..3a93ba11b4b 100644 --- a/test/src/casefiddle-tests.el +++ b/test/src/casefiddle-tests.el | |||
| @@ -196,7 +196,7 @@ | |||
| 196 | ("fish" "FISH" "fish" "Fish" "Fish") | 196 | ("fish" "FISH" "fish" "Fish" "Fish") |
| 197 | ("Straße" "STRASSE" "straße" "Straße" "Straße") | 197 | ("Straße" "STRASSE" "straße" "Straße" "Straße") |
| 198 | 198 | ||
| 199 | ;; The word repeated twice to test behaviour at the end of a word | 199 | ;; The word repeated twice to test behavior at the end of a word |
| 200 | ;; inside of an input string as well as at the end of the string. | 200 | ;; inside of an input string as well as at the end of the string. |
| 201 | ("ΌΣΟΣ ΌΣΟΣ" "ΌΣΟΣ ΌΣΟΣ" "όσος όσος" "Όσος Όσος" "ΌΣΟΣ ΌΣΟΣ") | 201 | ("ΌΣΟΣ ΌΣΟΣ" "ΌΣΟΣ ΌΣΟΣ" "όσος όσος" "Όσος Όσος" "ΌΣΟΣ ΌΣΟΣ") |
| 202 | ;; What should be done with sole sigma? It is ‘final’ but on the | 202 | ;; What should be done with sole sigma? It is ‘final’ but on the |
diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el index 6236c9276d2..93f7f63847f 100644 --- a/test/src/fns-tests.el +++ b/test/src/fns-tests.el | |||
| @@ -237,7 +237,7 @@ | |||
| 237 | (apply 'concat (make-list o s))) | 237 | (apply 'concat (make-list o s))) |
| 238 | 238 | ||
| 239 | (defmacro fns-tests--with-region (funcname string &rest args) | 239 | (defmacro fns-tests--with-region (funcname string &rest args) |
| 240 | "Apply FUNCNAME in a temp bufer on the region produced by STRING." | 240 | "Apply FUNCNAME in a temp buffer on the region produced by STRING." |
| 241 | (declare (indent 1)) | 241 | (declare (indent 1)) |
| 242 | `(with-temp-buffer | 242 | `(with-temp-buffer |
| 243 | (insert ,string) | 243 | (insert ,string) |