mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-02 20:16:25 +00:00
Code Issues Releases Activity

Spelling fixes

Browse Source
This commit is contained in:
Paul Eggert 2019-12-09 18:44:35 -08:00
parent 28578f87b5
commit d1a791f8ed
49 changed files with 119 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.3
View File

@ -1039,7 +1039,7 @@
recursively sorted with the same mechanism. That way variables tied
to a particular subdirectory override those in a parent directory.
Previously the behaviour didn’t seem to be well defined anyway and was
Previously the behavior didn’t seem to be well defined anyway and was
dependent on the order they appeared in the file. However this order
was changed in version 26.1 and it probably also depended on the
number of dir-local files that are merged.
@ -7238,7 +7238,8 @@
2018-04-17 Andreas Schwab <schwab@suse.de>
Fix undefined behaviour while looking for lexical-binding file variable (bug 31186)
Fix undefined behavior while looking for lexical-binding file
variable (bug 31186).
* src/lread.c (lisp_file_lexically_bound_p): Reset
beg_end_state before reading variable or value.
@ -63858,7 +63859,7 @@
2016-01-20 Eli Zaretskii <eliz@gnu.org>
Anoter fix for problematic merge from emacs-25
Another fix for problematic merge from emacs-25
* src/w32fns.c (globals_of_w32fns): Move initialization of
resetstkoflw to a non-Cygwin part.

10
doc/emacs/macos.texi
View File

@ -99,7 +99,7 @@ keys and the fullscreen behavior. To see all such options, use
@subsection Modifier keys
The following variables control the behaviour of the actual modifier
The following variables control the behavior of the actual modifier
keys:
@table @code
@ -135,12 +135,12 @@ which describes the modifier when used with ordinary keys, function keys
If the @var{symbol} is one of @code{control}, @code{meta}, @code{alt},
@code{super} or @code{hyper}, this describes the Emacs modifier it
represents. If @var{symbol} is @code{none}, Emacs does not use the
key, which retains its standard behaviour. For instance, the
key, which retains its standard behavior. For instance, the
@key{Option} key in macOS is then used for composing additional
characters.
The variables for right-hand keys, like @code{ns-right-alternate-modifier},
may also be set to @code{left}, which means to use the same behaviour as
may also be set to @code{left}, which means to use the same behavior as
the corresponding left-hand key.
@subsection Font Panel
@ -210,7 +210,7 @@ the mouse.
The sending application has some limited ability to decide how Emacs
handles the sent object, but the user may override the default
behaviour by holding one or more modifier key.
behavior by holding one or more modifier key.
@table @kbd
@item control
@ -220,7 +220,7 @@ will insert the filename.
Attempt to open the object as though it is a file or URL.
@item super/command
Perform the default action for the type. This can be useful when an
application is overriding the default behaviour.
application is overriding the default behavior.
@end table
The modifier keys listed above are defined by macOS and are unaffected

4
doc/lispintro/emacs-lisp-intro.texi
View File

@ -103,7 +103,7 @@
@c number suitable for the title page, and update-date to be the date,
@c in the preferred style for these. E.g., run the shell command:
@c texi2any -D 'edition-number 3.11' \
@c -D 'titlepage-edition-number Revised Third Edtion' \
@c -D 'titlepage-edition-number Revised Third Edition' \
@c -D 'update-date 31 March 2020'
@c This relates mainly to the published book sold by the FSF.
@ -3832,7 +3832,7 @@ delimit them from the body of the @code{let}.
@findex if
@cindex Conditional with @code{if}
Anoter special form is the conditional @code{if}. This form is used
Another special form is the conditional @code{if}. This form is used
to instruct the computer to make decisions. You can write function
definitions without using @code{if}, but it is used often enough, and
is important enough, to be included here. It is used, for example, in

2
doc/lispref/display.texi
View File

@ -5622,7 +5622,7 @@ area from the left of the original image, and if negative the offset
from the right. If @var{y} is a positive number it specifies the
offset from the top of the original image, and if negative from the
bottom. If @var{x} or @var{y} are @code{nil} or unspecified the crop
area will be centred on the original image.
area will be centered on the original image.
If the crop area is outside or overlaps the edge of the image it will
be reduced to exclude any areas outside of the image. This means it

2
doc/lispref/internals.texi
View File

@ -565,7 +565,7 @@ for threshold exhaustion regularly, for efficiency reasons it does not
do so immediately after every change to the heap or to
@code{gc-cons-threshold} or @code{gc-cons-percentage}, so exhausting
the threshold does not immediately trigger garbage collection. Also,
for efficency in threshold calculations Emacs approximates the heap
for efficiency in threshold calculations Emacs approximates the heap
size, which counts the bytes used by currently-accessible objects in
the heap.

2
doc/lispref/processes.texi
View File

@ -2990,7 +2990,7 @@ broadcast address, and network mask.
Optional argument @var{family} specified as symbol @code{ipv4} or
@code{ipv6} restricts the returned information to IPv4 and IPv6
addresses respectively, independently of the value of @var{full}.
Speficying @code{ipv6} when IPv6 support is not available will result
Specifying @code{ipv6} when IPv6 support is not available will result
in an error being signaled.
Some examples:

2
doc/lispref/searching.texi
View File

@ -1032,7 +1032,7 @@ In conventional string syntax, it would be written
The @code{rx} notation is mainly useful in Lisp code; it cannot be
used in most interactive situations where a regexp is requested, such
as when running @code{query-replace-regexp} or in variable
customisation.
customization.
@menu
* Rx Constructs:: Constructs valid in rx forms.

2
doc/misc/efaq.texi
View File

@ -3218,7 +3218,7 @@ You can tell Emacs the shell's current directory with the command
@item
Third party packages.
Any package you install into Emacs can run arbtitrary code with the
Any package you install into Emacs can run arbitrary code with the
same privileges as the Emacs process itself. Be aware of this when
you use the package system (e.g. @code{M-x list-packages}) with third
party archives. Use only third parties that you can trust!

2
doc/misc/flymake.texi
View File

@ -548,7 +548,7 @@ by calling the function @code{flymake-make-diagnostic}.
Make a Flymake diagnostic for @var{buffer}'s region from @var{beg} to
@var{end}. @var{type} is a diagnostic symbol (@pxref{Flymake error
types}), and @var{text} is a description of the problem detected in
this region. Currently, it is unspecified behaviour to make
this region. Currently, it is unspecified behavior to make
diagnostics for buffers other than the buffer that the Flymake backend
is responsible for.
@end deffn

2
doc/misc/org.texi
View File

@ -8648,7 +8648,7 @@ takes precedence over an @samp{ID} property defined on the node itself.
@item @code{org-attach-method}
@vindex org-attach-method
When attaching files using the dispatcher @kbd{C-c C-a} it
defaults to copying files. The behaviour can be changed by
defaults to copying files. The behavior can be changed by
customizing @code{org-attach-method}. Options are Copy, Move/Rename,
Hard link or Symbolic link.

2
doc/misc/texinfo.tex
View File

@ -7690,7 +7690,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% If SUBTOPIC is present, precede it with a space, and call \doind.
% (At some time during the 20th century, this made a two-level entry in an
% index such as the operation index. Nobody seemed to notice the change in
% behaviour though.)
% behavior though.)
\def\dosubind#1#2#3{%
\def\thirdarg{#3}%
\ifx\thirdarg\empty

18
etc/NEWS
View File

@ -743,7 +743,7 @@ column zero.
---
*** The new 'compilation-transform-file-match-alist' user option can
be used to transform file name matches compilation output, and remove
known false positives being recognised as warnings/errors.
known false positives being recognized as warnings/errors.
** cl-lib.el
+++
@ -1336,7 +1336,7 @@ Of course it will still find it if you have it in "~/.ecompleterc".
---
*** 'mm-uu-diff-groups-regexp' now defaults to matching all groups,
which means that "git am" diffs are recognised everywhere.
which means that "git am" diffs are recognized everywhere.
+++
*** Two new Gnus summary mode navigation commands have been added,
@ -1987,7 +1987,7 @@ exclude most headers when forwarding.
*** 'mml-secure-openpgp-sign-with-sender' sets also "gpg --sender"
When 'mml-secure-openpgp-sign-with-sender' is non-nil message sender's
email address (in addition to its old behaviour) will also be used to
email address (in addition to its old behavior) will also be used to
set gpg's "--sender email@domain" option.
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
an amount which was close to near a full screen. This is now instead
available by scrolling with the meta modifier key.
To get the old behaviour back, customize the user option
To get the old behavior back, customize the user option
'mouse-wheel-scroll-amount', or add the following to your init file:
(customize-set-variable 'mouse-wheel-scroll-amount
'(5 ((shift) . 1) ((control) . nil)))
By default, the font size will be changed in the window that the mouse
pointer is over. To change this behaviour, you can customize the user
pointer is over. To change this behavior, you can customize the user
option 'mouse-wheel-follow-mouse'. Note that this will also affect
scrolling.
@ -3319,8 +3319,8 @@ Previously it was supported only in the Cygwin-w32 build.
** Emacs now handles key combinations involving the macOS "command"
and "option" modifier keys more correctly.
** MacOS modifier key behaviour is now more adjustable.
The behaviour of the macOS "Option", "Command", "Control" and
** MacOS modifier key behavior is now more adjustable.
The behavior of the macOS "Option", "Command", "Control" and
"Function" keys can now be specified separately for use with
ordinary keys, function keys and mouse clicks. This allows using them
in their standard macOS way for composing characters.
@ -3370,9 +3370,9 @@ fonts. See the documentation of this function and variable in the
Emacs manual for more details.
+++
** On NS the behaviour of drag and drop can now be modified by use of
** On NS the behavior of drag and drop can now be modified by use of
modifier keys in line with Apples guidelines. This makes the drag and
drop behaviour more consistent, as previously the sending application
drop behavior more consistent, as previously the sending application
was able to 'set' modifiers without the knowledge of the user.
** On NS multicolor font display is enabled again since it is also

12
etc/ORG-NEWS
View File

@ -92,7 +92,7 @@ the message to 30 characters in order to build the description of the
link. This behavior was considered as too surprising. As
a consequence, Org no longer truncates subjects.
You can get the old behaviour back with the following:
You can get the old behavior back with the following:
: (setq org-email-link-description-format "Email %c: %.30s")
@ -170,7 +170,7 @@ From now on inheritance requires no extra property and will adhere to
customized to always be activated or never be activated in
~org-attach-use-inheritance~.
The ATTACH_DIR property is deprecated in favour of the shorter
The ATTACH_DIR property is deprecated in favor of the shorter
property DIR. Links to folders inside the DIR property can now be
declared as relative links. This is not enabled by default, but can
be set in ~org-attach-dir-relative~.
@ -178,7 +178,7 @@ be set in ~org-attach-dir-relative~.
When adding new attachment to the outline node the preferred way of
doing so can be customized. Take a look at
~org-attach-preferred-new-method~. It defaults to using ID since that
was the behaviour before this change.
was the behavior before this change.
If both DIR and ID properties are set on the same node, DIR has
precedence and will be used.
@ -335,7 +335,7 @@ parameters in ~sql-connection-alist~.
The builtin "latex" exporters now accept and use a =:scale= attribute,
which scales an image by a given factor.
This attribute is wrapped adound the =scale= parameter of LaTeX's
This attribute is wrapped around the =scale= parameter of LaTeX's
=\includegraphics= (bitmap images) or a TiKZ's =\scalebox=.
Therefore, its value should be some string palatable to LaTeX as
a positive float Its default value is an empty string (i.e. disabled).
@ -386,7 +386,7 @@ You can install it back from MELPA.
*** ~org-capture-insert-template-here~
*** ~org-attach-directory~
It has been deprecated in favour of ~org-attach-id-dir~ which is less
It has been deprecated in favor of ~org-attach-id-dir~ which is less
ambiguous given the restructured org-attach.
*** ~org-enable-fixed-width-editor~
@ -612,7 +612,7 @@ document, use =shrink= value instead, or in addition to align:
Function ~org-get-tags~ used to return local tags to the current
headline. It now returns all the inherited tags in addition to the
local tags. In order to get the old behaviour back, you can use:
local tags. In order to get the old behavior back, you can use:
: (org-get-tags nil t)

2
lisp/ChangeLog.5
View File

@ -7912,7 +7912,7 @@
* simple.el (choose-completion): Check for
next-single-property-change returning nil.
* mouse.el (mouse-choose-completion): Dito.
* mouse.el (mouse-choose-completion): Ditto.
1994-07-28 Richard Stallman <rms@mole.gnu.ai.mit.edu>

2
lisp/ChangeLog.8
View File

@ -618,7 +618,7 @@
1999-12-12 Martin Stjernholm <mast@lysator.liu.se>
Changes for new style variable init system:
* cc-langs.el (c-common-init): Dito.
* cc-langs.el (c-common-init): Ditto.
* cc-styles.el: c-offsets-alist moved to cc-vars.el since it's
now customizable.
* cc-vars.el: Style variables may now take a value

2
lisp/char-fold.el
View File

@ -253,7 +253,7 @@ Each entry is a list of a character and the strings that fold into it."
:version "27.1")
(defcustom char-fold-exclude char-fold--default-exclude
"Character foldings to remove from default decompisitions.
"Character foldings to remove from default decompositions.
Each entry is a list of a character and the strings to remove from folding."
:type '(alist :key-type (character :tag "Fold to character")
:value-type (repeat (string :tag "Fold from string")))

2
lisp/elec-pair.el
View File

@ -230,7 +230,7 @@ inside a comment or string."
(electric-pair-mode nil)
;; When adding the "closer" delimiter, a job his function is
;; frequently used for, we don't want to munch any extra
;; newlines above us. That would be the default behaviour of
;; newlines above us. That would be the default behavior of
;; `electric-layout-mode', which potentially kicked in before
;; us to add these newlines, and is probably about to kick in
;; again after we add the closer.

4
lisp/electric.el
View File

@ -423,10 +423,10 @@ If multiple rules match, only first one is executed.")
;; newlines, re-indentation is prevented.
;;
;; FIXME: when `newline'ing, we exceptionally
;; prevent a specific behaviour of
;; prevent a specific behavior of
;; `eletric-pair-mode', that of opening an extra
;; newline between newly inserted matching paris.
;; In theory that behaviour should be provided by
;; In theory that behavior should be provided by
;; `electric-layout-mode' instead, which should be
;; possible given the current API.
;;

2
lisp/emacs-lisp/backtrace.el
View File

@ -709,7 +709,7 @@ line and recenter window line accordingly."
(defun backtrace-print-to-string (obj &optional limit)
"Return a printed representation of OBJ formatted for backtraces.
Attempt to get the length of the returned string under LIMIT
charcters with appropriate settings of `print-level' and
characters with appropriate settings of `print-level' and
`print-length.' LIMIT defaults to `backtrace-line-length'."
(backtrace--with-output-variables backtrace-view
(backtrace--print-to-string obj limit)))

2
lisp/emacs-lisp/rx.el
View File

@ -275,7 +275,7 @@ Return (REGEXP . PRECEDENCE)."
;; -> "[A-Z@%[:digit:][:space:][:word:]]"
;;
;; Problem: If a subpattern is carefully written to be
;; optimisable by regexp-opt, how do we prevent the transforms
;; optimizable by regexp-opt, how do we prevent the transforms
;; above from destroying that property?
;; Example: (or "a" (or "abc" "abd" "abe"))
(cond

2
lisp/faces.el
View File

@ -1773,7 +1773,7 @@ If FRAME is nil, that stands for the selected frame."
(defun defined-colors-with-face-attributes (&optional frame)
"Return a list of colors supported for a particular frame.
See `defined-colors' for arguments and return value. In contrast
to `define-colorss' the elements of the returned list are color
to `define-colors' the elements of the returned list are color
strings with text properties, that make the color names render
with the color they represent as background color."
(mapcar

2
lisp/font-lock.el
View File

@ -1101,7 +1101,7 @@ accessible portion of the current buffer."
Called with two arguments BEG and END.")
(defun font-lock-debug-fontify ()
"Reinitialise the font-lock machinery and (re-)fontify the buffer.
"Reinitialize the font-lock machinery and (re-)fontify the buffer.
This functions is a convenience functions when developing font
locking for a mode, and is not meant to be called from lisp functions."
(interactive)

2
lisp/gnus/gnus-art.el
View File

@ -2088,7 +2088,7 @@ you're expecting some kind of apostrophe or quotation mark, then
try this wash."
(interactive)
(article-translate-strings gnus-article-smartquotes-map))
(define-obsolete-function-alias 'article-treat-dumquotes
(define-obsolete-function-alias 'article-treat-dumbquotes
#'article-treat-smartquotes "27.1")
(defvar org-entities)

4
lisp/net/goto-addr.el
View File

@ -100,7 +100,7 @@ A value of t means there is no limit--fontify regardless of the size."
'("mailto:" "data:")
"List of URI schemes to exclude from `goto-address-uri-schemes'.
Customisations to this variable made after goto-addr is loaded
Customizations to this variable made after goto-addr is loaded
will have no effect.")
(defvar goto-address-uri-schemes
@ -111,7 +111,7 @@ will have no effect.")
(copy-sequence thing-at-point-uri-schemes))
"List of URI schemes matched by `goto-address-url-regexp'.
Customisations to this variable made after goto-addr is loaded
Customizations to this variable made after goto-addr is loaded
will have no effect.")
(defvar goto-address-url-regexp

6
lisp/net/nsm.el
View File

@ -384,7 +384,7 @@ Security (DTLS)\", \"(4.1. General Guidelines)\"
This check is a response to Logjam[1]. Logjam is an attack that
allows an attacker with sufficient resource, and positioned
between the user and the server, to downgrade vulnerable TLS
connections to insecure 512-bit export grade crypotography.
connections to insecure 512-bit export grade cryptography.
The Logjam paper suggests using 1024-bit prime on the client to
mitigate some effects of this attack, and upgrade to 2048-bit as
@ -550,7 +550,7 @@ Security (TLS) and Datagram Transport Layer Security (DTLS)\",
Due to its use of 64-bit block size, it is known that a
ciphertext collision is highly likely when 2^32 blocks are
encrypted with the same key bundle under 3-key 3DES. Practical
birthday attacks of this kind have been demostrated by Sweet32[1].
birthday attacks of this kind have been demonstrated by Sweet32[1].
As such, NIST is in the process of disallowing its use in TLS[2].
[1]: Bhargavan, Leurent (2016). \"On the Practical (In-)Security of
@ -752,7 +752,7 @@ protocol."
;; Plain connection allowed.
(memq :none saved-fingerprints)
;; We are pinning certs, and we have seen this host before,
;; but the credientials for this host differs from the last
;; but the credentials for this host differs from the last
;; times we saw it.
(member (nsm-fingerprint status) saved-fingerprints))))

2
lisp/net/tramp-cmds.el
View File

@ -359,7 +359,7 @@ The remote connection identified by SOURCE is flushed by
;; Append local file name if none is specified.
(when (string-equal (file-remote-p target) target)
(setq target (concat target (file-remote-p source 'localname))))
;; Make them directoy names.
;; Make them directory names.
(setq source (directory-file-name source)
target (directory-file-name target))

2
lisp/org/org-agenda.el
View File

@ -7636,7 +7636,7 @@ and deselects entries with tag `John' or matching the regexp `plot'.
During entry of the filter, completion for tags, categories and effort
values is offered. Since the syntax for categories and tags is identical
there should be no overlap between categoroes and tags. If there is, tags
there should be no overlap between categories and tags. If there is, tags
get priority.
A single `\\[universal-argument]' prefix arg STRIP-OR-ACCUMULATE will negate the

2
lisp/org/org-table.el
View File

@ -1709,7 +1709,7 @@ The function assumes `org-table-copy-increment' is non-nil."
(number-suffix-regexp (rx (and (one-or-more digit) string-end)))
(analyze
(lambda (field)
;; Analyse string FIELD and return information related to
;; Analyze string FIELD and return information related to
;; increment or nil. When non-nil, return value has the
;; following scheme: (TYPE VALUE PATTERN) where
;; - TYPE is a symbol among `number', `prefix', `suffix'

2
lisp/org/org.el
View File

@ -10008,7 +10008,7 @@ By default the available states are \"TODO\" and \"DONE\". So, for this
example: when the item starts with TODO, it is changed to DONE.
When it starts with DONE, the DONE is removed. And when neither TODO nor
DONE are present, add TODO at the beginning of the heading.
You can set up single-charcter keys to fast-select the new state. See the
You can set up single-character keys to fast-select the new state. See the
`org-todo-keywords' and `org-use-fast-todo-selection' for details.
With `\\[universal-argument]' prefix ARG, force logging the state change \

6
lisp/progmodes/python.el
View File

@ -3737,9 +3737,9 @@ Pdbtracking would open the file for current stack frame found in pdb output by
`python-pdbtrack-stacktrace-info-regexp' and add overlay arrow in currently
inspected line in that file.
After command listed in `python-pdbtrack-continue-command' or
`python-pdbtrack-exit-command' is sent to pdb, pdbtracking session is
considered over. Overlay arrow will be removed from currentry tracked
After the command listed in `python-pdbtrack-continue-command' or
`python-pdbtrack-exit-command' is sent to pdb, the pdbtracking session is
considered over. The overlay arrow will be removed from the currently tracked
buffer. Additionally, if `python-pdbtrack-kill-buffers' is non-nil, all
files opened by pdbtracking will be killed."
:type 'boolean

2
lisp/simple.el
View File

@ -50,7 +50,7 @@ wait this many seconds after Emacs becomes idle before doing an update."
The `undo' command will normally consider \"similar\" changes
(like inserting characters) to be part of the same change. This
is called \"amalgamating\" the changes. This variable says what
the maximum number of changes condidered is when amalgamating. A
the maximum number of changes considered is when amalgamating. A
value of 1 means that nothing is amalgamated.")
(defgroup killing nil

48
lisp/so-long.el
View File

@ -38,7 +38,7 @@
;; compacted into the smallest file size possible, which often entails removing
;; newlines should they not be strictly necessary). This can result in lines
;; which are many thousands of characters long, and most programming modes
;; simply aren't optimised (remotely) for this scenario, so performance can
;; simply aren't optimized (remotely) for this scenario, so performance can
;; suffer significantly.
;;
;; When such files are detected, the command `so-long' is automatically called,
@ -90,7 +90,7 @@
;; * Overview of modes and commands
;; --------------------------------
;; - `global-so-long-mode' - A global minor mode which enables the automated
;; behaviour, causing the user's preferred action to be invoked whenever a
;; behavior, causing the user's preferred action to be invoked whenever a
;; newly-visited file contains excessively long lines.
;; - `so-long-mode' - A major mode, and the default action.
;; - `so-long-minor-mode' - A minor mode version of the major mode, and an
@ -111,7 +111,7 @@
;;
;; On rare occasions you may choose to manually invoke the `so-long' command,
;; which invokes your preferred `so-long-action' (exactly as the automatic
;; behaviour would do if it had detected long lines). You might use this if a
;; behavior would do if it had detected long lines). You might use this if a
;; problematic file did not meet your configured criteria, and you wished to
;; trigger the performance improvements manually.
;;
@ -120,7 +120,7 @@
;; available to `so-long' but, like any other mode, they can be invoked directly
;; if you have a need to do that (see also "Other ways of using so-long" below).
;;
;; If the behaviour ever triggers when you did not want it to, you can use the
;; If the behavior ever triggers when you did not want it to, you can use the
;; `so-long-revert' command to restore the buffer to its original state.
;; * Basic configuration
@ -199,7 +199,7 @@
;;
;; Note that `so-long-minor-modes' is not useful for other global minor modes
;; (as distinguished from globalized minor modes), but in some cases it will be
;; possible to inhibit or otherwise counter-act the behaviour of a global mode
;; possible to inhibit or otherwise counter-act the behavior of a global mode
;; by overriding variables, or by employing hooks (see below). You would need
;; to inspect the code for a given global mode (on a case by case basis) to
;; determine whether it's possible to inhibit it for a single buffer -- and if
@ -211,7 +211,7 @@
;; If `so-long-action' is set to either `so-long-mode' or `so-long-minor-mode',
;; the buffer-local value for each variable in the list is set to the associated
;; value in the alist. Use this to enforce values which will improve
;; performance or otherwise avoid undesirable behaviours. If `so-long-revert'
;; performance or otherwise avoid undesirable behaviors. If `so-long-revert'
;; is called, then the original values are restored.
;; * Hooks
@ -325,7 +325,7 @@
;; meaning you would need to add to `safe-local-variable-values' in order to
;; avoid being queried about them.
;;
;; Finally, the `so-long-predicate' user option enables the automated behaviour
;; Finally, the `so-long-predicate' user option enables the automated behavior
;; to be determined by a custom function, if greater control is needed.
;; * Implementation notes
@ -342,7 +342,7 @@
;; * Caveats
;; ---------
;; The variables affecting the automated behaviour of this library (such as
;; The variables affecting the automated behavior of this library (such as
;; `so-long-action') can be used as file- or dir-local values in Emacs 26+, but
;; not in previous versions of Emacs. This is on account of improvements made
;; to `normal-mode' in 26.1, which altered the execution order with respect to
@ -399,7 +399,7 @@
;; 0.6 - Added `so-long-minor-modes' and `so-long-hook'.
;; 0.5 - Renamed library to "so-long.el".
;; - Added explicit `so-long-enable' command to activate our advice.
;; 0.4 - Amended/documented behaviour with file-local 'mode' variables.
;; 0.4 - Amended/documented behavior with file-local 'mode' variables.
;; 0.3 - Defer to a file-local 'mode' variable.
;; 0.2 - Initial release to EmacsWiki.
;; 0.1 - Experimental.
@ -500,7 +500,7 @@ files would prevent Emacs from handling them correctly."
(defcustom so-long-invisible-buffer-function #'so-long-deferred
"Function called in place of `so-long' when the buffer is not displayed.
This affects the behaviour of `global-so-long-mode'.
This affects the behavior of `global-so-long-mode'.
We treat invisible buffers differently from displayed buffers because, in
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'."
(defun so-long--action-type ()
"Generate a :type for `so-long-action' based on `so-long-action-alist'."
;; :type seemingly cannot be a form to be evaluated on demand, so we
;; endeavour to keep it up-to-date with `so-long-action-alist' by
;; endeavor to keep it up-to-date with `so-long-action-alist' by
;; calling this from `so-long--action-alist-setter'.
`(radio ,@(mapcar (lambda (x) (list 'const :tag (cadr x) (car x)))
(assq-delete-all nil so-long-action-alist))
@ -609,7 +609,7 @@ will be automatically processed; but custom actions can also do these things.
The value `longlines-mode' causes that minor mode to be enabled. See
longlines.el for more details.
Each action likewise determines the behaviour of `so-long-revert'.
Each action likewise determines the behavior of `so-long-revert'.
If the value is nil, or not defined in `so-long-action-alist', then no action
will be taken."
@ -756,7 +756,7 @@ By default this happens if `so-long-action' is set to either `so-long-mode'
or `so-long-minor-mode'. If `so-long-revert' is subsequently invoked, then the
disabled modes are re-enabled by calling them with the numeric argument 1.
`so-long-hook' can be used where more custom behaviour is desired.
`so-long-hook' can be used where more custom behavior is desired.
Please submit bug reports to recommend additional modes for this list, whether
they are in Emacs core, GNU ELPA, or elsewhere."
@ -833,7 +833,7 @@ If nil, no mode line indicator will be displayed."
;; Modes that go slowly and line lengths excessive
;; Font-lock performance becoming oppressive
;; All of my CPU tied up with strings
;; These are a few of my least-favourite things
;; These are a few of my least-favorite things
(defvar-local so-long-original-values nil
"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."
;; triggered by mouse when some other window is selected.
"Revert the current action and invoke the chosen replacement.
This commmand calls `so-long' with the selected action as an argument.")
This command calls `so-long' with the selected action as an argument.")
sym)
:enable (not (and so-long--active
(eq ',actionfunc so-long-function)
@ -1129,7 +1129,7 @@ This minor mode is a standard `so-long-action' option."
(if so-long-minor-mode ;; We are enabling the mode.
(progn
;; Housekeeping. `so-long-minor-mode' might be invoked directly rather
;; than via `so-long', so replicate the necessary behaviours. The minor
;; than via `so-long', so replicate the necessary behaviors. The minor
;; mode also cares about whether `so-long' was already active, as we do
;; not want to remember values which were potentially overridden already.
(unless (or so-long--calling so-long--active)
@ -1201,9 +1201,9 @@ values), despite potential performance issues, type \\[so-long-revert].
Use \\[so-long-commentary] for more information.
Use \\[so-long-customize] to configure the behaviour."
Use \\[so-long-customize] to configure the behavior."
;; Housekeeping. `so-long-mode' might be invoked directly rather than via
;; `so-long', so replicate the necessary behaviours. We could use this same
;; `so-long', so replicate the necessary behaviors. We could use this same
;; test in `so-long-after-change-major-mode' to run `so-long-hook', but that's
;; not so obviously the right thing to do, so I've omitted it for now.
(unless so-long--calling
@ -1249,7 +1249,7 @@ Use \\[so-long-customize] to configure the behaviour."
This advice acts before `so-long-mode', with the previous mode still active."
(unless (derived-mode-p 'so-long-mode)
;; Housekeeping. `so-long-mode' might be invoked directly rather than
;; via `so-long', so replicate the necessary behaviours.
;; via `so-long', so replicate the necessary behaviors.
(unless so-long--calling
(so-long-remember-all :reset))
;; Remember the original major mode, regardless.
@ -1334,7 +1334,7 @@ This is the `so-long-revert-function' for `so-long-mode'."
;; Emacs 26+ has already called `hack-local-variables' (during
;; `run-mode-hooks'; provided there was a `buffer-file-name'), but for older
;; versions we need to call it here. In Emacs 26+ the revised 'HANDLE-MODE'
;; argument is set to `no-mode' (being the non-nil-and-non-t behaviour),
;; argument is set to `no-mode' (being the non-nil-and-non-t behavior),
;; which we mimic here by binding `so-long--hack-local-variables-no-mode',
;; in order to prevent a local 'mode' variable from clobbering the major
;; mode we have just called.
@ -1371,7 +1371,7 @@ because we do not want to downgrade the major mode in that scenario."
;; Act only if `so-long-mode' would be enabled by the current action.
(when (and (symbolp (so-long-function))
(provided-mode-derived-p (so-long-function) 'so-long-mode))
;; Downgrade from `so-long-mode' to the `so-long-minor-mode' behaviour.
;; Downgrade from `so-long-mode' to the `so-long-minor-mode' behavior.
(setq so-long-function 'turn-on-so-long-minor-mode
so-long-revert-function 'turn-off-so-long-minor-mode))))
@ -1391,7 +1391,7 @@ and cannot be conveniently intercepted, so we are forced to replicate it here.
This special-case code will ultimately be removed from Emacs, as it exists to
deal with a deprecated feature; but until then we need to replicate it in order
to inhibit our own behaviour in the presence of a header comment `mode'
to inhibit our own behavior in the presence of a header comment `mode'
declaration.
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
major mode to `so-long-mode' by this point, that protection is insufficient
and so we need to perform our own test.
We likewise need to support an equivalent of the `no-mode' behaviour in 26.1+
We likewise need to support an equivalent of the `no-mode' behavior in 26.1+
to ensure that `so-long-mode-revert' will not restore a file-local mode again
after it has already reverted to the original mode.
@ -1673,7 +1673,7 @@ When such files are detected by `so-long-predicate', we invoke the selected
Use \\[so-long-commentary] for more information.
Use \\[so-long-customize] to configure the behaviour."
Use \\[so-long-customize] to configure the behavior."
:global t
:group 'so-long
(if global-so-long-mode

8
src/coding.c
View File

@ -7333,7 +7333,7 @@ produce_annotation (struct coding_system *coding, ptrdiff_t pos)
the text from the end of the gap (and GPT must be equal to PT).
When the text is taken from the gap, it can't be at the beginning
of the gap because the new decoded text is progressively acumulated
of the gap because the new decoded text is progressively accumulated
at the beginning of the gap before it gets inserted at PT (this way,
as the output grows, the input shrinks, so we only need to allocate
enough space for `max(IN, OUT)` instead of `IN + OUT`).
@ -9876,7 +9876,7 @@ encode_string_utf_8 (Lisp_Object string, Lisp_Object buffer,
pure-ASCII; only use NOCOPY non-zero if the caller will only use
the byte sequence of the decoded result accessed via SDATA or
SSDATA, and if the original STRING will _not_ be modified after the
decoding. When in dount, always pass NOCOPY as zero. You _have_
decoding. When in doubt, always pass NOCOPY as zero. You _have_
been warned!
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,
int repeat_count;
Lisp_Object val;
/* Check arguments. Return Qnil when an argmement is invalid. */
/* Check arguments. Return Qnil when an argument is invalid. */
if (! STRINGP (string))
return Qnil;
if (! NILP (buffer)
@ -10236,7 +10236,7 @@ DEFUN ("internal-decode-string-utf-8", Finternal_decode_string_utf_8,
int repeat_count;
Lisp_Object val;
/* Check arguments. Return Qnil when an argmement is invalid. */
/* Check arguments. Return Qnil when an argument is invalid. */
if (! STRINGP (string))
return Qnil;
if (! NILP (buffer)

4
src/frame.c
View File

@ -3560,7 +3560,7 @@ window managers may refuse to honor a HEIGHT that is not an integer
multiple of the default frame font height.
When called interactively, HEIGHT is the numeric prefix and the
currenly selected frame will be set to this height. */)
currently selected frame will be set to this height. */)
(Lisp_Object frame, Lisp_Object height, Lisp_Object pretend, Lisp_Object pixelwise)
{
struct frame *f = decode_live_frame (frame);
@ -3589,7 +3589,7 @@ window managers may refuse to honor a WIDTH that is not an integer
multiple of the default frame font width.
When called interactively, WIDTH is the numeric prefix and the
currenly selected frame will be set to this width. */)
currently selected frame will be set to this width. */)
(Lisp_Object frame, Lisp_Object width, Lisp_Object pretend, Lisp_Object pixelwise)
{
struct frame *f = decode_live_frame (frame);

2
src/hbfont.c
View File

@ -541,7 +541,7 @@ hbfont_shape (Lisp_Object lgstring, Lisp_Object direction)
Implementation note: the character codepoint recorded in
each glyph is not really used, except when we display the
glyphs in descr-text.el. So this is just an aeasthetic
glyphs in descr-text.el. So this is just an aesthetic
issue. */
if (buf_reversed)
cluster_offset = to - from;

28
src/nsterm.m
View File

@ -9432,8 +9432,8 @@ syms_of_nsterm (void)
DEFVAR_LISP ("ns-alternate-modifier", ns_alternate_modifier,
"This variable describes the behavior of the alternate or option key.\n\
Either SYMBOL, describing the behaviour for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\
Either SYMBOL, describing the behavior for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\
separately for ordinary keys, function keys, and mouse events.\n\
\n\
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.");
DEFVAR_LISP ("ns-right-alternate-modifier", ns_right_alternate_modifier,
"This variable describes the behavior of the right alternate or option key.\n\
Either SYMBOL, describing the behaviour for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\
Either SYMBOL, describing the behavior for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\
separately for ordinary keys, function keys, and mouse events.\n\
It can also be `left' to use the value of `ns-alternate-modifier' instead.\n\
\n\
@ -9453,8 +9453,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning.");
DEFVAR_LISP ("ns-command-modifier", ns_command_modifier,
"This variable describes the behavior of the command key.\n\
Either SYMBOL, describing the behaviour for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\
Either SYMBOL, describing the behavior for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\
separately for ordinary keys, function keys, and mouse events.\n\
\n\
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.");
DEFVAR_LISP ("ns-right-command-modifier", ns_right_command_modifier,
"This variable describes the behavior of the right command key.\n\
Either SYMBOL, describing the behaviour for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\
Either SYMBOL, describing the behavior for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\
separately for ordinary keys, function keys, and mouse events.\n\
It can also be `left' to use the value of `ns-command-modifier' instead.\n\
\n\
@ -9474,8 +9474,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning.");
DEFVAR_LISP ("ns-control-modifier", ns_control_modifier,
"This variable describes the behavior of the control key.\n\
Either SYMBOL, describing the behaviour for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\
Either SYMBOL, describing the behavior for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\
separately for ordinary keys, function keys, and mouse events.\n\
\n\
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.");
DEFVAR_LISP ("ns-right-control-modifier", ns_right_control_modifier,
"This variable describes the behavior of the right control key.\n\
Either SYMBOL, describing the behaviour for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\
Either SYMBOL, describing the behavior for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\
separately for ordinary keys, function keys, and mouse events.\n\
It can also be `left' to use the value of `ns-control-modifier' instead.\n\
\n\
@ -9495,8 +9495,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning.");
DEFVAR_LISP ("ns-function-modifier", ns_function_modifier,
"This variable describes the behavior of the function (fn) key.\n\
Either SYMBOL, describing the behaviour for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\
Either SYMBOL, describing the behavior for any event,\n\
or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\
separately for ordinary keys, function keys, and mouse events.\n\
\n\
Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\

2
src/window.h
View File

@ -429,7 +429,7 @@ struct window
i.e., always survive Fset_window_buffer. */
bool_bf fringes_persistent : 1;
/* True if this window's croll bar specifications are persistent,
/* True if this window's scroll bar specifications are persistent,
i.e., always survive Fset_window_buffer. */
bool_bf scroll_bars_persistent : 1;

2
test/lisp/bookmark-tests.el
View File

@ -38,7 +38,7 @@
"Bookmark file used for testing.")
(defvar bookmark-tests-example-file
;; We use abbreviate-file-name here to match the behaviour of
;; We use abbreviate-file-name here to match the behavior of
;; `bookmark-buffer-file-name'.
(abbreviate-file-name (expand-file-name "example.txt" bookmark-tests-data-dir))
"Example file used for testing.")

2
test/lisp/calc/calc-tests.el
View File

@ -271,7 +271,7 @@ An existing calc stack is reused, otherwise a new one is created."
(+ (- (* 2 (var y var-y)) (var x var-x)) (* 3 (var z var-z)))
-3))
'(vec (var x var-x) (var y var-y) (var z var-z)))
;; The `float' forms in the result are just artefacts of Calc's
;; The `float' forms in the result are just artifacts of Calc's
;; current solver; it should be fixed to produce exact (integral)
;; results in this case.
'(vec (calcFunc-eq (var x var-x) (float 1 0))

2
test/lisp/cedet/semantic-utest-c.el
View File

@ -59,7 +59,7 @@
(semantic-fetch-tags))))
(when (or (not tags-expected) (not tags-actual))
(message "Tried to find test files in: %s" semantic-utest-c-test-directory)
(error "Failed: Disovered no tags in test files or test file not found."))
(error "Failed: Discovered no tags in test files or test file not found."))
;; Now that we have the tags, compare them for SPP accuracy.
(dolist (tag tags-actual)

2
test/lisp/emacs-lisp/rx-tests.el
View File

@ -79,7 +79,7 @@
;; Range of raw characters, multibyte.
(should (equal (rx (any "Å\211\326-\377\177"))
"[\177Å\211\326-\377]"))
;; Split range; \177-\377ÿ should not be optimised to \177-\377.
;; Split range; \177-\377ÿ should not be optimized to \177-\377.
(should (equal (rx (any "\177-\377" ?ÿ))
"[\177ÿ\200-\377]")))

4
test/lisp/files-tests.el
View File

@ -1300,7 +1300,7 @@ renaming only, rather than modified in-place."
(should (equal (file-size-human-readable-iec 72528034765) "67.5 GiB")))
(ert-deftest files-test-magic-mode-alist-re-baseline ()
"Test magic-mode-alist with RE, expected behaviour for match."
"Test magic-mode-alist with RE, expected behavior for match."
(let ((magic-mode-alist '(("my-tag" . text-mode))))
(with-temp-buffer
(insert "my-tag")
@ -1308,7 +1308,7 @@ renaming only, rather than modified in-place."
(should (eq major-mode 'text-mode)))))
(ert-deftest files-test-magic-mode-alist-re-no-match ()
"Test magic-mode-alist with RE, expected behaviour for no match."
"Test magic-mode-alist with RE, expected behavior for no match."
(let ((magic-mode-alist '(("my-tag" . text-mode))))
(with-temp-buffer
(insert "not-my-tag")

2
test/lisp/net/tramp-tests.el
View File

@ -3168,7 +3168,7 @@ They might differ only in time attributes or directory size."
(when (< start-time
(float-time (tramp-compat-file-attribute-modification-time attr2)))
(setcar (nthcdr 5 attr2) tramp-time-dont-know))
;; Status change time. Dito.
;; Status change time. Ditto.
(when (or (tramp-compat-time-equal-p
(tramp-compat-file-attribute-status-change-time attr1)
tramp-time-dont-know)

4
test/lisp/so-long-tests/so-long-tests.el
View File

@ -58,7 +58,7 @@
(declare-function so-long-tests-assert-reverted "so-long-tests-helpers")
(declare-function so-long-tests-assert-and-revert "so-long-tests-helpers")
;; Enable the automated behaviour for all tests.
;; Enable the automated behavior for all tests.
(global-so-long-mode 1)
(ert-deftest so-long-tests-threshold-under ()
@ -180,7 +180,7 @@
;; From Emacs 27 the `display-buffer' call is insufficient.
;; The various 'window change functions' are now invoked by the
;; redisplay, and redisplay does nothing at all in batch mode,
;; so we cannot test under this revised behaviour. Refer to:
;; so we cannot test under this revised behavior. Refer to:
;; https://lists.gnu.org/archive/html/emacs-devel/2019-10/msg00971.html
;; For interactive (non-batch) test runs, calling `redisplay'
;; does do the trick; so do that first.

2
test/lisp/so-long-tests/spelling-tests.el
View File

@ -57,7 +57,7 @@
(unwind-protect
(cl-letf (((symbol-function 'ispell-command-loop)
(lambda (_miss _guess word _start _end)
(message "Unrecognised word: %s." word)
(message "Unrecognized word: %s." word)
(throw 'mistake t))))
(catch 'mistake
(find-library "so-long")

2
test/manual/cedet/tests/testusing.cpp
View File

@ -168,7 +168,7 @@ void func8()
; //#10# ( "four" "three" )
}
// Check convetional namespace aliases
// Check conventional namespace aliases
// - fully qualified -
void func9()
{

4
test/src/buffer-tests.el
View File

@ -646,7 +646,7 @@ with parameters from the *Messages* buffer modification."
(deftest-overlays-at-1 R 50 (a) (a 1 60) (c 1 1) (b 30 30) (d 50 50))
(deftest-overlays-at-1 S 60 () (a 1 60) (c 1 1) (b 30 30) (d 50 50))
;; behaviour at point-min and point-max
;; behavior at point-min and point-max
(ert-deftest test-overlays-at-2 ()
(cl-macrolet ((should-length (n list)
`(should (= ,n (length ,list)))))
@ -743,7 +743,7 @@ with parameters from the *Messages* buffer modification."
(deftest-overlays-in-1 af 10 11 (a) (a 10 10))
;; behaviour at point-max
;; behavior at point-max
(ert-deftest test-overlays-in-2 ()
(cl-macrolet ((should-length (n list)
`(should (= ,n (length ,list)))))

2
test/src/casefiddle-tests.el
View File

@ -196,7 +196,7 @@
("fish" "FISH" "fish" "Fish" "Fish")
("Straße" "STRASSE" "straße" "Straße" "Straße")
;; The word repeated twice to test behaviour at the end of a word
;; The word repeated twice to test behavior at the end of a word
;; inside of an input string as well as at the end of the string.
("ΌΣΟΣ ΌΣΟΣ" "ΌΣΟΣ ΌΣΟΣ" "όσος όσος" "Όσος Όσος" "ΌΣΟΣ ΌΣΟΣ")
;; What should be done with sole sigma? It is ‘final’ but on the

2
test/src/fns-tests.el
View File

@ -237,7 +237,7 @@
(apply 'concat (make-list o s)))
(defmacro fns-tests--with-region (funcname string &rest args)
"Apply FUNCNAME in a temp bufer on the region produced by STRING."
"Apply FUNCNAME in a temp buffer on the region produced by STRING."
(declare (indent 1))
`(with-temp-buffer
(insert ,string)