(show-paren-function): Allow new paren-class info.

1 files changed, 6 insertions, 1 deletions

diff --git a/lisp/paren.el b/lisp/paren.el
index a1cc12712f7..ece3ed3c606 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -181,7 +181,12 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
                                        (cdr (syntax-after beg)))
                                    (eq (char-after beg)
                                        ;; This can give nil.
-                                       (cdr (syntax-after (1- end)))))))))))))
+                                       (cdr (syntax-after (1- end))))
+                                   ;; The cdr might hold a new paren-class
+                                   ;; info rather than a matching-char info,
+                                   ;; in which case the two CDRs should match.
+                                   (eq (cdr (syntax-after (1- end)))
+                                       (cdr (syntax-after beg))))))))))))
         ;;
         ;; Highlight the other end of the sexp, or unhighlight if none.
         (if (not pos)