[Emacs-diffs] Changes to emacs/lisp/paren.el

[Stefan Monnier]

Index: emacs/lisp/paren.el
diff -c emacs/lisp/paren.el:1.60 emacs/lisp/paren.el:1.61
*** emacs/lisp/paren.el:1.60    Mon Dec  6 19:04:58 2004
--- emacs/lisp/paren.el Tue Apr 19 18:15:38 2005
***************
*** 1,6 ****
  ;;; paren.el --- highlight matching paren
  
! ;; Copyright (C) 1993, 1996, 2001, 2004  Free Software Foundation, Inc.
  
  ;; Author: address@hidden
  ;; Maintainer: FSF
--- 1,6 ----
  ;;; paren.el --- highlight matching paren
  
! ;; Copyright (C) 1993, 1996, 2001, 2004, 2005  Free Software Foundation, Inc.
  
  ;; Author: address@hidden
  ;; Maintainer: FSF
***************
*** 139,146 ****
  (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)))
            pos mismatch face)
        ;;
        ;; Find the other end of the sexp.
--- 139,146 ----
  (defun show-paren-function ()
    (if show-paren-mode
        (let ((oldpos (point))
!           (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,175 ****
              ;; 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 `$'.
                    (setq mismatch
                          (not (or (eq (char-before end)
                                       ;; This can give nil.
--- 169,175 ----
              ;; kind of paren to match the one we started at.
              (when (integerp pos)
                (let ((beg (min pos oldpos)) (end (max pos oldpos)))
!                 (unless (eq (syntax-class (syntax-after beg)) 8)
                    (setq mismatch
                          (not (or (eq (char-before end)
                                       ;; This can give nil.