summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2022-06-24 13:52:51 +0200
committerStefan Kangas <stefan@marxist.se>2022-06-24 13:52:51 +0200
commit81e58d1ce5a16fbe4cad543b1b011fe52da5d70c (patch)
treefb74ce8496311b34d68ae04de01c76810b1add1b /lisp/net
parent391acd91344c833d94d89b2862b272d08643c068 (diff)
parenta772c0b85272bc20858a35af5f619983cfcb0084 (diff)
downloademacs-81e58d1ce5a16fbe4cad543b1b011fe52da5d70c.tar.gz
emacs-81e58d1ce5a16fbe4cad543b1b011fe52da5d70c.tar.bz2
emacs-81e58d1ce5a16fbe4cad543b1b011fe52da5d70c.zip
Merge from origin/emacs-28
a772c0b852 ; Fix typos: prefer US spelling. # Conflicts: # doc/misc/modus-themes.org
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/rcirc.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 00b57ab8e73..eca7b2046c5 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -3482,7 +3482,7 @@ form \"PARAMETER\" to enable a feature, \"PARAMETER=VALUE\" to
configure a specific option or \"-PARAMETER\" to disable a
previously specified feature. SENDER is passed on to
`rcirc-handler-generic'. PROCESS is the process object for the
-current connection. Note that this is not the behaviour as
+current connection. Note that this is not the behavior as
specified in RFC2812, where 005 stood for RPL_BOUNCE."
(rcirc-handler-generic process "005" sender args text)
(with-rcirc-process-buffer process