summaryrefslogtreecommitdiff
path: root/lisp/elec-pair.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/elec-pair.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/elec-pair.el')
-rw-r--r--lisp/elec-pair.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 4b901071cd9..e5adb0dda73 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -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)