From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 7 Jun 2025 10:32:41 +0000 (+0300)
Subject: ; Fix last change (bug#78396)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e0f2344ac4ae14e81fd7060f29fe3eda568d7d0a;p=emacs.git

; Fix last change (bug#78396)

* lisp/paren.el (show-paren-not-in-comments-or-strings):
* etc/NEWS:
* doc/emacs/programs.texi (Matching): Fix wording and punctuation
in doc string, defcustom tags, manual, and NEWS.

(cherry picked from commit bed490f0f2d2a8ec7181a7a6b65520a7e40f78fb)
---

diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 36c676c2718..f8ad7596b4e 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1027,8 +1027,10 @@ nonblank line.
 @vindex show-paren-not-in-comments-or-strings
 If the value of @code{show-paren-not-in-comments-or-strings} is
 @code{all}, delimiters inside comments and strings will not be
-highlighted.  Otherwise if the value is set to @code{on-mismatch}, the
-mismatched delimiters inside comments will not be highlighted.
+highlighted.  Otherwise, if the value is set to @code{on-mismatch}, the
+mismatched delimiters inside comments will not be highlighted.  The
+default is @code{nil}, so delimiters inside comments and strings are
+always highlighted.
 @end itemize
 
 @cindex Electric Pair mode
diff --git a/lisp/paren.el b/lisp/paren.el
index 986576a8e1d..5a70e2771b3 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -111,16 +111,17 @@ On non-graphical frames, the context is shown in the echo area."
   :version "29.1")
 
 (defcustom show-paren-not-in-comments-or-strings nil
-  "Do not highlight the paren that are inside a comment or string.
-If set to `all', do not highlight the paren that are inside comments
-or strings.
-If set to `on-mismatch', the paren mismatched inside comments will not be
-highlighted.
-If set to nil (by default), highlight the paren wherever it is."
+  "If non-nil, do not highlight the parens inside comments and strings.
+If set to `all', never highlight parens inside comments and strings.
+If set to `on-mismatch', do not highlight mismatched parens inside
+comments and strings.
+If set to nil (the default), always highlight parens wherever they are."
   :type '(choice
-          (const :tag "Never highlight" all)
-          (const :tag "Don't highlight when mismatched" on-mismatch)
-          (const :tag "Always highlight" nil))
+          (const :tag "Never highlight parens in comments and strings" all)
+          (const
+           :tag "Don't highlight mismatched parens in comments and strings"
+           on-mismatch)
+          (const :tag "Always highlight parens" nil))
   :version "31.1")
 
 (defvar show-paren--idle-timer nil)