1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-26 10:49:33 +00:00

Merge from origin/emacs-28

5e47ec9511 ; * lisp/url/url-http.el (url-http-parse-headers): Fix typo.
ba0871bef1 ; Fix typos: prefer American spelling
e3e7f31faa Adapt Tramp doc

# Conflicts:
#	etc/NEWS
#	etc/themes/modus-themes.el
#	lisp/emacs-lisp/byte-opt.el
#	test/lisp/so-long-tests/spelling-tests.el
This commit is contained in:
Stefan Kangas 2022-07-14 11:37:42 +02:00
commit 4e79f77635
35 changed files with 305 additions and 300 deletions

View File

@ -4040,7 +4040,7 @@
* lisp/progmodes/xref.el (xref--query-replace-1):
Say 'All results processed' at the end if the user hadn't
cancelled the process (bug#23284).
canceled the process (bug#23284).
2016-05-07 Eli Zaretskii <eliz@gnu.org>
@ -12542,7 +12542,7 @@
* lisp/erc/erc-backend.el (erc-server-setup-periodical-ping): Checks
for existing timers in the alist before adding new ones. If a
timer already exists, it is cancelled and
timer already exists, it is canceled and
overwritten. (bug#19292).
2015-12-27 Jens Lechtenboerger <jens.lechtenboerger@fsfe.org>
@ -22108,7 +22108,7 @@
* src/gfilenotify.c (dir_monitor_callback): Cancel the monitor if
the file or directory to be watched is deleted.
(Fgfile_add_watch): Make watch_object a triple.
(Fgfile_rm_watch): Check, whether watch is cancelled already.
(Fgfile_rm_watch): Check, whether watch is canceled already.
(Fgfile_valid_p): New defun.
(syms_of_gfilenotify): Declare Sgfile_valid_p.

File diff suppressed because it is too large Load Diff

View File

@ -6,6 +6,6 @@ Re "behavior" vs "behaviour", etc.
for new text (code, docs), choose the US variant.
- It's probably (IMHO --ttn, 2017-10-13) not a high priority to
change existing text; use your best judgement (ask if unsure).
change existing text; use your best judgment (ask if unsure).
- https://lists.gnu.org/r/emacs-devel/2005-06/msg00489.html

View File

@ -1898,7 +1898,7 @@ attempts. Other zero-width assertions may also bring benefits by
causing a match to fail early.
@item
Avoid or-patterns in favour of character alternatives: write
Avoid or-patterns in favor of character alternatives: write
@samp{[ab]} instead of @samp{a\|b}. Recall that @samp{\s-} and @samp{\sw}
are equivalent to @samp{[[:space:]]} and @samp{[[:word:]]}, respectively.
@ -1933,7 +1933,7 @@ purposes.
@ifnottex
@item
Consider using @code{rx} (@pxref{Rx Notation}); it can optimise some
Consider using @code{rx} (@pxref{Rx Notation}); it can optimize some
or-patterns automatically and will never introduce capturing groups
unless explicitly requested.
@end ifnottex

View File

@ -3394,7 +3394,7 @@ for @var{object} is the current buffer.
Search for the next region that has text property @var{prop} set to
@var{value} according to @var{predicate}.
This function is modelled after @code{search-forward} and friends in
This function is modeled after @code{search-forward} and friends in
that it moves point, but it returns a structure that describes the
match instead of returning it in @code{match-beginning} and friends.

View File

@ -327,7 +327,7 @@ Example of a loop summing a list of numbers:
@anchor{Tail recursion}
Recursive calls to @var{name} that occur in @emph{tail
positions} in @var{body} are guaranteed to be optimised as @emph{tail
positions} in @var{body} are guaranteed to be optimized as @emph{tail
calls}, which means that they will not consume any additional stack
space no matter how deeply the recursion runs. Such recursive calls
will effectively jump to the top of the loop with new values for the
@ -1363,7 +1363,7 @@ disappear without prior notice.
The byte-compiler can also warn about lexical variables that are
special in other Emacs Lisp files, often indicating a missing
@code{defvar} declaration. This useful but somewhat specialised check
@code{defvar} declaration. This useful but somewhat specialized check
requires three steps:
@enumerate

View File

@ -5070,7 +5070,7 @@ Opening bracket for adopted articles. The default is @samp{<}.
@item ]
Closing bracket, which is normally @samp{]}, but can also be @samp{>}
for adopted articles. This can be customised using following settings:
for adopted articles. This can be customized using following settings:
@table @code
@item gnus-sum-closing-bracket

View File

@ -2162,7 +2162,7 @@ things with precision ([[#h:bf1c82f2-46c7-4eb2-ad00-dd11fdd8b53f][Customization
This section is of interest only to users who are prepared to maintain
their own local tweaks and who are willing to deal with any possible
incompatibilities between versioned releases of the themes. As such,
they are labelled as "do-it-yourself" or "DIY".
they are labeled as "do-it-yourself" or "DIY".
** More accurate colors in terminal emulators
:PROPERTIES:
@ -2605,7 +2605,7 @@ this example:
Whenever we enter a ~diff-mode~ buffer, we now get a magenta-colored
region.
Perhaps you may wish to generalise those findings in to a set of
Perhaps you may wish to generalize those findings in to a set of
functions that also accept an arbitrary face. We shall leave the
experimentation up to you.

View File

@ -2866,12 +2866,12 @@ For more information and examples see the [[https://orgmode.org/worg/org-tutoria
- transpose ::
When =y=, =yes=, or =t= attempt to transpose the table data before
plotting. Also recognises the shorthand option =trans=.
plotting. Also recognizes the shorthand option =trans=.
- =type= ::
Specify the type of the plot, by default one of =2d=, =3d=, =radar=, or =grid=.
Available types can be customised with ~org-plot/preset-plot-types~.
Available types can be customized with ~org-plot/preset-plot-types~.
- =with= ::

View File

@ -667,6 +667,11 @@ may be used in your init file:
(with-eval-after-load 'tramp (tramp-change-syntax 'simplified))
@end lisp
@vindex enable-remote-dir-locals
Changing other variables via directory-local variables on a remote
directory must be enabled by setting @code{enable-remote-dir-locals}
to non-@code{nil}, @xref{Directory Variables, , , emacs}.
@menu
* Connection types:: Types of connections to remote hosts.
@ -2427,7 +2432,7 @@ example below:
@end lisp
@vindex password-word-equivalents
This user option is, by default, initialised from
This user option is, by default, initialized from
@code{password-word-equivalents} when @value{tramp} is loaded, and it
is usually more convenient to add new passphrases to that user option
instead of altering this user option.
@ -5819,15 +5824,15 @@ The verbosity levels are
@*@indent @w{ 4} activities
@*@indent @w{ 5} internal
@*@indent @w{ 6} sent and received strings
@*@indent @w{ 7} file caching
@*@indent @w{ 8} connection properties
@*@indent @w{ 7} connection properties
@*@indent @w{ 8} file caching
@*@indent @w{ 9} test commands
@*@indent @w{10} traces (huge)
@*@indent @w{11} call traces (maintainer only)
With @code{tramp-verbose} greater than or equal to 4, messages are
also written to a @value{tramp} debug buffer. Such debug buffers are
essential to bug and problem analyses. For @value{tramp} bug reports,
essential to bug and problem analyzes. For @value{tramp} bug reports,
set the @code{tramp-verbose} level to 6 (@pxref{Bug Reports}).
The debug buffer is in

View File

@ -1449,7 +1449,7 @@ the entire buffer.
*** 'so-long-target-modes' now includes 'fundamental-mode' by default.
This means that 'global-so-long-mode' will also process files which were
not recognised. (This only has an effect if 'set-auto-mode' chooses
not recognized. (This only has an effect if 'set-auto-mode' chooses
'fundamental-mode'; buffers which are simply in 'fundamental-mode' by
default are unaffected.)
@ -1763,8 +1763,8 @@ If non-nil (the default), create registry entries for all messages.
If nil, don't automatically create entries, they must be created
manually.
*** New user options to customise the summary line specs "%[" and "%]".
Four new options introduced in customisation group
*** New user options to customize the summary line specs "%[" and "%]".
Four new options introduced in customization group
'gnus-summary-format'. These are 'gnus-sum-opening-bracket',
'gnus-sum-closing-bracket', 'gnus-sum-opening-bracket-adopted', and
'gnus-sum-closing-bracket-adopted'. Their default values are "[", "]",
@ -2102,7 +2102,7 @@ modified flag. The default is nil, to preserve the old behavior.
** CC mode
*** Added support for Doxygen documentation style.
'doxygen' is now a valid 'c-doc-comment-style' which recognises all
'doxygen' is now a valid 'c-doc-comment-style' which recognizes all
comment styles supported by Doxygen (namely '///', '//!', '/** … */'
and '/*! … */'. 'gtkdoc' remains the default for C and C++ modes; to
use 'doxygen' by default one might evaluate:

View File

@ -293,7 +293,7 @@ with width equal to the pixel-width of the buffer text multiplied by 0.7.
This functionality is implemented in a new function,
~org-display-inline-image--width~ which contains the width
determination logic previously in ~org-display-inline-images~ and the
new behaviour.
new behavior.
** New options
*** Option ~org-hidden-keywords~ now also applies to #+SUBTITLE:
@ -311,7 +311,7 @@ descriptions.
*** New option ~org-id-ts-format~
Earlier, IDs generated using =ts= method had a hard-coded format (i.e. =20200923T160237.891616=).
The new option allows user to customise the format.
The new option allows user to customize the format.
Defaults are unchanged.
*** New argument for ~file-desc~ babel header
@ -503,16 +503,16 @@ heading, except return nil.
*** Faces of all the heading text elements now conform to the headline face
In the past, faces of todo keywords, emphasised text, tags, and
In the past, faces of todo keywords, emphasized text, tags, and
priority cookies inherited =default= face. The resulting headline
fontification was not always consistent, as discussed in [[msg::87h7sawubl.fsf@protesilaos.com][this bug
report]]. Now, the relevant faces adapt to face used to fontify the
current headline level.
Users who prefer to keep the old behaviour should change their face
customisation explicitly stating that =default= face is inherited.
Users who prefer to keep the old behavior should change their face
customization explicitly stating that =default= face is inherited.
Example of old face customisation:
Example of old face customization:
#+begin_src emacs-lisp
(setq org-todo-keyword-faces '(("TODO"
@ -520,7 +520,7 @@ Example of old face customisation:
:height 0.75)))
#+end_src
To preserve the old behaviour the above customisation should be
To preserve the old behavior the above customization should be
changed to
#+begin_src emacs-lisp
@ -543,7 +543,7 @@ The function does not allow for a third optional parameter anymore.
*** LaTeX environment =#+results= are now removed
If a babel src block produces a raw LaTeX environment, it will now be
recognised as a result, and so replaced when re-evaluated.
recognized as a result, and so replaced when re-evaluated.
*** Tag completion now uses =completing-read-multiple=
@ -681,7 +681,7 @@ enabled, and point is neither in a table nor on a timestamp or a link:
- =C-j= (bound to the new command ~org-return-and-maybe-indent~)
merely inserts a newline.
To get the previous behaviour back, disable ~electric-indent-mode~
To get the previous behavior back, disable ~electric-indent-mode~
explicitly:
#+begin_src emacs-lisp
@ -1029,7 +1029,7 @@ Previously all session names had ~org-babel-session-~ prepended.
*** Forward/backward paragraph functions in line with the rest of Emacs
~org-forward-paragraph~ and ~org-backward-paragraph~, bound to
~<C-UP>~ and ~<C-DOWN>~ functions mimic more closely behaviour of
~<C-UP>~ and ~<C-DOWN>~ functions mimic more closely behavior of
~forward-paragraph~ and ~backward-paragraph~ functions when
available.

View File

@ -825,7 +825,7 @@
2015-03-10 Paul Eggert <eggert@cs.ucla.edu>
Prefer "initialize" to "initialise"
Prefer "initialize"
* progmodes/js.el (js-indent-first-init):
Rename from js-indent-first-initialiser, to avoid worrying about
American vs British spelling. All uses changed.

View File

@ -5165,7 +5165,7 @@
* sql.el (sql-interbase): New function.
(sql-interbase-program): New option.
(sql-interbase-options): New option.
And some typos fixed: "customise" to "customize".
And some typos fixed: "customize".
2001-03-06 Dave Love <fx@gnu.org>

View File

@ -579,7 +579,7 @@ The decision is taken by order of preference:
(save-excursion (electric-pair--insert pair))))))))
(defun electric-pair-open-newline-between-pairs-psif ()
"Honour `electric-pair-open-newline-between-pairs'.
"Honor `electric-pair-open-newline-between-pairs'.
Member of `post-self-insert-hook' if `electric-pair-mode' is on."
(when (and (if (functionp electric-pair-open-newline-between-pairs)
(funcall electric-pair-open-newline-between-pairs)

View File

@ -171,7 +171,7 @@ Earlier variables shadow later ones with the same name.")
(if (eq fn localfn)
;; From the same file => same mode.
(macroexp--unfold-lambda `(,fn ,@(cdr form)))
;; Since we are called from inside the optimiser, we need to make
;; Since we are called from inside the optimizer, we need to make
;; sure not to propagate lexvar values.
(let ((byte-optimize--lexvars nil)
;; Silence all compilation warnings: the useful ones should
@ -204,7 +204,7 @@ Same format as `byte-optimize--lexvars', with shared structure and contents.")
This indicates the loop discovery phase.")
(defvar byte-optimize--dynamic-vars nil
"List of variables declared as dynamic during optimisation.")
"List of variables declared as dynamic during optimization.")
(defvar byte-optimize--aliased-vars nil
"List of variables which may be aliased by other lexical variables.
@ -315,7 +315,7 @@ for speeding up processing.")
(`(cond . ,clauses)
;; FIXME: The condition in the first clause is always executed, and
;; clause bodies are mutually exclusive -- use this for improved
;; optimisation (see comment about `if' below).
;; optimization (see comment about `if' below).
(cons fn
(mapcar (lambda (clause)
(if (consp clause)
@ -364,9 +364,9 @@ for speeding up processing.")
;; FIXME: We have to traverse the expressions in left-to-right
;; order (because that is the order of evaluation and variable
;; mutations must be found prior to their use), but doing so we miss
;; some optimisation opportunities:
;; some optimization opportunities:
;; consider (and A B) in a for-effect context, where B => nil.
;; Then A could be optimised in a for-effect context too.
;; Then A could be optimized in a for-effect context too.
(let ((tail exps)
(args nil))
(while tail
@ -380,19 +380,19 @@ for speeding up processing.")
;; FIXME: If the loop condition is statically nil after substitution
;; of surrounding variables then we can eliminate the whole loop,
;; even if those variables are mutated inside the loop.
;; We currently don't perform this important optimisation.
;; We currently don't perform this important optimization.
(let* ((byte-optimize--vars-outside-loop byte-optimize--lexvars)
(condition-body
(if byte-optimize--inhibit-outside-loop-constprop
;; We are already inside the discovery phase of an outer
;; loop so there is no need for traversing this loop twice.
(cons exp exps)
;; Discovery phase: run optimisation without substitution
;; Discovery phase: run optimization without substitution
;; of variables bound outside this loop.
(let ((byte-optimize--inhibit-outside-loop-constprop t))
(cons (byte-optimize-form exp nil)
(byte-optimize-body exps t)))))
;; Optimise again, this time with constprop enabled (unless
;; Optimize again, this time with constprop enabled (unless
;; we are in discovery of an outer loop),
;; as mutated variables have been marked as non-substitutable.
(condition (byte-optimize-form (car condition-body) nil))
@ -438,12 +438,12 @@ for speeding up processing.")
(`(internal-make-closure . ,_)
(and (not for-effect)
(progn
;; Look up free vars and mark them to be kept, so that they
;; won't be optimised away.
(dolist (var (caddr form))
(let ((lexvar (assq var byte-optimize--lexvars)))
(when lexvar
(setcar (cdr lexvar) t))))
;; Look up free vars and mark them to be kept, so that they
;; won't be optimized away.
(dolist (var (caddr form))
(let ((lexvar (assq var byte-optimize--lexvars)))
(when lexvar
(setcar (cdr lexvar) t))))
form)))
(`((lambda . ,_) . ,_)
@ -513,7 +513,7 @@ for speeding up processing.")
(defun byte-optimize-one-form (form &optional for-effect)
"The source-level pass of the optimizer."
;; Make optimiser aware of lexical arguments.
;; Make optimizer aware of lexical arguments.
(let ((byte-optimize--lexvars
(mapcar (lambda (v) (list (car v) t))
byte-compile--lexical-environment)))
@ -525,7 +525,7 @@ for speeding up processing.")
;; First, optimize all sub-forms of this one.
(setq form (byte-optimize-form-code-walker form for-effect))
;; If a form-specific optimiser is available, run it and start over
;; If a form-specific optimizer is available, run it and start over
;; until a fixpoint has been reached.
(and (consp form)
(symbolp (car form))

View File

@ -812,7 +812,7 @@ function passes responsibility to the functions in
Other third-party values of `eldoc-documentation-strategy' should
not use `eldoc--make-callback'. They must find some alternate
way to produce callbacks to feed to
`eldoc-documentation-functions' and should endeavour to display
`eldoc-documentation-functions' and should endeavor to display
the docstrings eventually produced, using
`eldoc-display-functions'."
(let* (;; How many callbacks have been created by the strategy

View File

@ -1883,7 +1883,7 @@ This value was determined experimentally.")
"Whether RGB is more readable against white than black.
RGB is a 3-element list (R G B), each component in the range [0,1].
This predicate can be used both for determining a suitable (black or white)
contrast colour with RGB as background and as foreground."
contrast color with RGB as background and as foreground."
(unless (<= 0 (apply #'min rgb) (apply #'max rgb) 1)
(error "RGB components %S not in [0,1]" rgb))
;; Compute the relative luminance after gamma-correcting (assuming sRGB),

View File

@ -7385,7 +7385,7 @@
2011-01-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-select-newsgroup): Don't propagate marks to
backends after sanitising on entry, because this never makes sense:
backends after sanitizing on entry, because this never makes sense:
If the articles have gone missing, then the data no longer exists on
the backend, and if they haven't, then Gnus is wrong, and shouldn't
overwrite anything anyway.

View File

@ -370,7 +370,7 @@ require user confirmation."
(defun icomplete-fido-exit (force)
"Attempt to exit minibuffer immediately with current input.
Unless FORCE is non-nil (interactively with a prefix argument),
honour a non-nil REQUIRE-MATCH argument to `completing-read' by
honor a non-nil REQUIRE-MATCH argument to `completing-read' by
trying to complete as much as possible and disallowing the exit
if that doesn't produce a completion match."
(interactive "P")

View File

@ -819,7 +819,7 @@ size, and full-buffer size."
(let* ((props (copy-sequence (text-properties-at (point))))
(face (plist-get props 'face)))
;; We don't want to use the faces on the indentation, because
;; that's ugly, but we do want to use the background colour.
;; that's ugly, but we do want to use the background color.
(when face
(setq props (plist-put props 'face (shr-face-background face))))
(add-text-properties gap-start (point) props))))

View File

@ -106,8 +106,8 @@ Any level x includes messages for all levels 1 .. x-1. The levels are
4 activities
5 internal
6 sent and received strings
7 file caching
8 connection properties
7 connection properties
8 file caching
9 test commands
10 traces (huge)
11 call traces (maintainer only)."
@ -621,7 +621,7 @@ This regexp must match both `tramp-initial-end-of-output' and
"Regexp matching password-like prompts.
The regexp should match at end of buffer.
This variable is, by default, initialised from
This variable is, by default, initialized from
`password-word-equivalents' when Tramp is loaded, and it is
usually more convenient to add new passphrases to that variable
instead of altering this variable.

View File

@ -4001,7 +4001,7 @@
buffer.
(org-agenda-ignore-drawer-properties): New option.
(org-agenda-prepare-buffers):
Honour `org-agenda-ignore-drawer-properties'.
Honor `org-agenda-ignore-drawer-properties'.
* org-clock.el (org-clock-goto): Recenter to thrd line
@ -4134,7 +4134,7 @@
(orgstruct-heading-prefix-regexp, orgstruct-setup-hook):
New options.
(orgstruct-initialized): New variable.
(org-get-local-variables): Honour state property.
(org-get-local-variables): Honor state property.
(org-run-like-in-org-mode): Use `let' instead of `progv'. Do not
override variables with non-default values.
(org-forward-heading-same-level): Do not skip to headlines on

View File

@ -140,7 +140,7 @@ to the highlighted and clickable region."
t)))
;; All groups 2..10 are within bounds.
(cons m-b1 m-e1)
;; The regexp doesn't fulfil the contract of
;; The regexp doesn't fulfill the contract of
;; bug-reference-bug-regexp, so fall back to the old behavior.
(unless (member bug-reference-bug-regexp
bug-reference--nonconforming-regexps)

View File

@ -1678,9 +1678,9 @@ the file they refer to is visited and `flymake-mode' is turned on
in the resulting buffer.
Flymake backends that somehow gain sporadic information about
diagnostics in neighbouring files may freely modify this variable
diagnostics in neighboring files may freely modify this variable
by adding or removing entries to for those files. If the
information about those neighbouring files is acquired repeatedly
information about those neighboring files is acquired repeatedly
and reliably, it may be more sensible to report them as
\"foreign\" diagnostics instead.

View File

@ -2817,7 +2817,7 @@ END-CHAR is the ending delimiter; will stop at end-of-buffer otherwise."
pieces)
(forward-char))
(t
(warn "Unrecognised escape char: %c" (following-char))))
(warn "Unrecognized escape char: %c" (following-char))))
(setq start (point)))
(push (buffer-substring start (1- (point))) pieces)
(let ((s (apply #'concat (nreverse pieces))))

View File

@ -3807,7 +3807,7 @@ function is redefined."
(default (and cur-printer (ses--locprn-def cur-printer)))
create-printer)
(cond
;; cancelled operation => do nothing
;; canceled operation => do nothing
((eq definition t))
;; no change => do nothing
((and cur-printer (equal definition default)))

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 so-long detects such a file, it calls the command `so-long', which
@ -412,7 +412,7 @@
;;
;; 1.1.2 - Use `so-long-mode-line-active' face on `mode-name' in `so-long-mode'.
;; 1.1.1 - Identical to 1.1, but fixing an incorrect GNU ELPA release.
;; 1.1 - Utilise `buffer-line-statistics' in Emacs 28+, with the new
;; 1.1 - Utilize `buffer-line-statistics' in Emacs 28+, with the new
;; `so-long-predicate' function `so-long-statistics-excessive-p'.
;; - Increase `so-long-threshold' from 250 to 10,000.
;; - Increase `so-long-max-lines' from 5 to 500.
@ -449,7 +449,7 @@
;; - Added sgml-mode and nxml-mode to `so-long-target-modes'.
;; 0.7.4 - Refactored the handling of `whitespace-mode'.
;; 0.7.3 - Added customization group `so-long' with user options.
;; - Added `so-long-original-values' to generalise the storage and
;; - Added `so-long-original-values' to generalize the storage and
;; restoration of values from the original mode upon `so-long-revert'.
;; - Added `so-long-revert-hook'.
;; 0.7.2 - Remember the original major mode even with M-x `so-long-mode'.
@ -642,7 +642,7 @@ Note that `so-long-statistics-excessive-p' requires Emacs 28.1 or later."
(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))

View File

@ -709,7 +709,7 @@ should be shown to the user."
;; gives the URI of the proxy. The recipient is expected
;; to repeat this single request via the proxy. 305
;; responses MUST only be generated by origin servers.
(error "Redirection thru a proxy server not supported: %s"
(error "Redirection through a proxy server not supported: %s"
redirect-uri))
(_
;; Treat everything like '300'

View File

@ -788,7 +788,7 @@ Default value of MODIFIERS is `shift-super'."
(const :tag "Hyper" hyper)
(const :tag "Super" super)
(const :tag "Alt" alt))))
"Customisation type for windmove modifiers.")
"Customization type for windmove modifiers.")
(defcustom windmove-default-keybindings nil
"Default keybindings for regular windmove commands.

View File

@ -965,7 +965,7 @@ DEFUN ("color-values-from-color-spec",
Scolor_values_from_color_spec,
1, 1, 0,
doc: /* Parse color SPEC as a numeric color and return (RED GREEN BLUE).
This function recognises the following formats for SPEC:
This function recognizes the following formats for SPEC:
#RGB, where R, G and B are hex numbers of equal length, 1-4 digits each.
rgb:R/G/B, where R, G, and B are hex numbers, 1-4 digits each.

View File

@ -65,7 +65,7 @@
2015-03-10 Paul Eggert <eggert@cs.ucla.edu>
Prefer "initialize" to "initialise"
Prefer "initialize"
* indent/js-indent-init-t.js: Rename from
indent/js-indent-first-initialiser-t.js.
* indent/js-indent-init-dynamic.js: Rename from

View File

@ -445,7 +445,7 @@ An existing calc stack is reused, otherwise a new one is created."
(t ; n<k<0
0))))
((natnump k)
;; Generalisation for any n, integral k≥0: use falling product
;; Generalization for any n, integral k≥0: use falling product
(/ (apply '* (number-sequence n (- n (1- k)) -1))
(calc-tests--fac k)))
(t (error "Case not covered"))))

View File

@ -38,7 +38,7 @@
bytecomp-test-var)
(defun bytecomp-test-identity (x)
"Identity, but hidden from some optimisations."
"Identity, but hidden from some optimizations."
x)
(defmacro bytecomp-test-loop (outer1 outer2 inner1 inner2)
@ -556,7 +556,7 @@ inner loops respectively."
((not x) 3)))
'("a" "b" "c" "d" nil))
;; `let' and `let*' optimisations with body being constant or variable
;; `let' and `let*' optimizations with body being constant or variable
(let* (a
(b (progn (setq a (cons 1 a)) 2))
(c (1+ b))
@ -582,7 +582,7 @@ inner loops respectively."
(let* (x y)
'a)
;; Check empty-list optimisations.
;; Check empty-list optimizations.
(mapcar (lambda (x) (member x nil)) '("a" 2 nil))
(mapcar (lambda (x) (memql x nil)) '(a 2 nil))
(mapcar (lambda (x) (memq x nil)) '(a nil))
@ -597,7 +597,7 @@ inner loops respectively."
(list (mapcar (lambda (x) (assoc (setq n (1+ n)) nil)) '(a "nil"))
n))
;; Exercise variable-aliasing optimisations.
;; Exercise variable-aliasing optimizations.
(let ((a (list 1)))
(let ((b a))
(let ((a (list 2)))

View File

@ -58,7 +58,7 @@
(find-spelling-mistake
(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")