(show-paren-function): Use it to recognize parens that are

also used in 2-char comment markers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e6ab2574917721837d4e7a8bfff7015f81b6420e..9ab4055dedd3411f7de63fcdd0197e763cd094e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * subr.el (syntax-class): New function.
+
+       * simple.el (blink-matching-open): Use it.
+
+       * paren.el (show-paren-function): Use it to recognize parens that are
+       also used in 2-char comment markers.
+
 2005-04-19  Lute Kamstra  <lute@gnu.org>
 
        * loadhist.el (unload-feature): Update for new format of
@@ -11,10 +20,9 @@
        (mac-centraleurroman, mac-cyrillic): Do not use UCS in table data
        for translation.
        (mac-symbol-encoder, mac-dingbats-encoder): New translation table.
-       (mac-font-encoder-list): Add entries for mac-symbol and
-       mac-dingbats.
-       (ccl-encode-mac-symbol-font, ccl-encode-mac-dingbats-font): New
-       CCL programs.
+       (mac-font-encoder-list): Add entries for mac-symbol and mac-dingbats.
+       (ccl-encode-mac-symbol-font, ccl-encode-mac-dingbats-font):
+       New CCL programs.
 
 2005-04-19  Kim F. Storm  <storm@cua.dk>
 

diff --git a/lisp/paren.el b/lisp/paren.el
index 63300ce62380289aac89399fffdfd52195b80b00..fe2beae4eddd0c8bc28026f6cd2f831550eef1a7 100644 (file)
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -1,6 +1,6 @@
 ;;; paren.el --- highlight matching paren
 
-;; Copyright (C) 1993, 1996, 2001, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: rms@gnu.org
 ;; Maintainer: FSF
@@ -139,8 +139,8 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
 (defun show-paren-function ()
   (if show-paren-mode
       (let ((oldpos (point))
-           (dir (cond ((eq (car (syntax-after (1- (point)))) 5) -1)
-                      ((eq (car (syntax-after (point))) 4) 1)))
+           (dir (cond ((eq (syntax-class (syntax-after (1- (point)))) 5) -1)
+                       ((eq (syntax-class (syntax-after (point)))      4) 1)))
            pos mismatch face)
        ;;
        ;; Find the other end of the sexp.
@@ -169,7 +169,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
              ;; kind of paren to match the one we started at.
              (when (integerp pos)
                (let ((beg (min pos oldpos)) (end (max pos oldpos)))
-                 (unless (eq (car (syntax-after beg)) 8) ;Not syntax `$'.
+                 (unless (eq (syntax-class (syntax-after beg)) 8)
                    (setq mismatch
                          (not (or (eq (char-before end)
                                       ;; This can give nil.