master 9533676302 1/3: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 953367630242d25228f22b0a210db8fb44e0ab30
Merge: 363821344d a9d338818a
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    a9d338818a ; elec-pair: Fix docstring typo (bug#56233)
---
 lisp/elec-pair.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 231dcdeb98..fa4d6d9849 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -498,7 +498,7 @@ The decision is taken by order of preference:
   corresponding delimiter for C;
 
 * According to C alone, by looking C up in the tables
-  `electric-pair-paris' or `electric-pair-text-pairs' (which
+  `electric-pair-pairs' or `electric-pair-text-pairs' (which
   see);
 
 * According to C's syntax and the syntactic state of the buffer