(show-paren-function): Fix last change (2004-12-02).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73331951608b7eb3d1fdfe9445af1d6a2e77ed34..2c6a4c5447bce8eb86431048612e98b2fa49aba3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2004-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * paren.el (show-paren-function): Fix last change (2004-12-02).
+
+       * international/mule-util.el (char-displayable-p): Return nil for
+       unibyte mode.
+
        * subr.el (subregexp-context-p): New function.
 
        * isearch.el (isearch-quote-char): Use it.
@@ -49,6 +54,12 @@
 
        * progmodes/sh-script.el (sh-indent-for-then): Change default.
 
+2004-12-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * simple.el (blink-matching-open):
+       * textmodes/tex-mode.el (tex-validate-region):
+       Obey syntax-table text properties.
+
 2004-12-02  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * wid-edit.el (widget-specify-field): Add `real-field' property to
@@ -114,7 +125,7 @@
        (xml-substitute-special): Fix validity error messages to
        actually show the unexpandable entity.  Added validity error if &
        isn't followed by an entity.
-       (xml-parse-tag): Concatnate any string following the a
+       (xml-parse-tag): Concatenate any string following the a
        <![CDATA[]]> section to the parsed CDATA.
        (xml-parse-dtd): Skip parameter entity declarations and use of
        parameter entities.

diff --git a/lisp/paren.el b/lisp/paren.el
index bc5c2f1f007a5bc517e11260cb0676c024e6068d..63300ce62380289aac89399fffdfd52195b80b00 100644 (file)
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -169,13 +169,14 @@ 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)))
-                 (when (/= (char-syntax (char-after beg)) ?\$)
+                 (unless (eq (car (syntax-after beg)) 8) ;Not syntax `$'.
                    (setq mismatch
-                         (not (eq (or (cdr (get-text-property (1- end) 'syntax-table))
-                                      (char-before end))
-                                  ;; This can give nil.
-                                  (or (cdr (get-text-property beg 'syntax-table))
-                                      (matching-paren (char-after beg))))))))))))
+                         (not (or (eq (char-before end)
+                                      ;; This can give nil.
+                                      (cdr (syntax-after beg)))
+                                  (eq (char-after beg)
+                                      ;; This can give nil.
+                                      (cdr (syntax-after (1- end)))))))))))))
        ;;
        ;; Highlight the other end of the sexp, or unhighlight if none.
        (if (not pos)