summaryrefslogtreecommitdiff
path: root/lisp/progmodes/flymake.el
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2022-07-14 11:37:42 +0200
committerStefan Kangas <stefan@marxist.se>2022-07-14 11:37:42 +0200
commit4e79f77635a80e0c25841ba15feb0e70c8824516 (patch)
tree7f68cf7d809a10e6c2501fb3d9451047fb8da051 /lisp/progmodes/flymake.el
parente1d93302c29916e738552484b9363c5b9e77c5c1 (diff)
parent5e47ec95118c06dd66cd488ad25775d801d75c0c (diff)
downloademacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.gz
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
Diffstat (limited to 'lisp/progmodes/flymake.el')
-rw-r--r--lisp/progmodes/flymake.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 0b7958e52fb..15ee5cb7d51 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -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.