(blink-matching-paren-dont-ignore-comments): New var.

(blink-matching-open): Use it.
Also, if the matching char hasn't paren syntax, call that mismatch.

diff --git a/lisp/simple.el b/lisp/simple.el
index 38ae6528fd7d3c23bd5132b23e57a323051f5abd..5699b1d350335f6cbb4b6bdb9ec8b8751ebc2348 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2611,6 +2611,9 @@ in the mode line."
 (defconst blink-matching-delay 1
   "*The number of seconds that `blink-matching-open' will delay at a match.")
 
+(defconst blink-matching-paren-dont-ignore-comments nil
+  "*Non-nil means `blink-matching-paren' should not ignore comments.")
+
 (defun blink-matching-open ()
   "Move cursor momentarily to the beginning of the sexp before point."
   (interactive)
@@ -2632,13 +2635,18 @@ in the mode line."
                                        (- (point) blink-matching-paren-distance))
                                   oldpos))
             (condition-case ()
-                (setq blinkpos (scan-sexps oldpos -1))
+                (let ((parse-sexp-ignore-comments
+                       (and parse-sexp-ignore-comments
+                            (not blink-matching-paren-dont-ignore-comments))))
+                  (setq blinkpos (scan-sexps oldpos -1)))
               (error nil)))
-          (and blinkpos (/= (char-syntax (char-after blinkpos))
-                            ?\$)
+          (and blinkpos
+               (/= (char-syntax (char-after blinkpos))
+                   ?\$)
                (setq mismatch
-                     (/= (char-after (1- oldpos))
-                         (matching-paren (char-after blinkpos)))))
+                     (or (null (matching-paren (char-after blinkpos)))
+                         (/= (char-after (1- oldpos))
+                             (matching-paren (char-after blinkpos))))))
           (if mismatch (setq blinkpos nil))
           (if blinkpos
               (progn