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

[Richard M. Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.617 emacs/lisp/simple.el:1.618
*** emacs/lisp/simple.el:1.617  Sat Aug 16 20:15:53 2003
--- emacs/lisp/simple.el        Fri Aug 29 12:07:16 2003
***************
*** 3500,3506 ****
                           (point)))))
         (let* ((oldpos (point))
              (blinkpos)
!             (mismatch))
         (save-excursion
           (save-restriction
             (if blink-matching-paren-distance
--- 3500,3507 ----
                           (point)))))
         (let* ((oldpos (point))
              (blinkpos)
!             (mismatch)
!             matching-paren)
         (save-excursion
           (save-restriction
             (if blink-matching-paren-distance
***************
*** 3514,3525 ****
                   (setq blinkpos (scan-sexps oldpos -1)))
               (error nil)))
           (and blinkpos
!               (/= (char-syntax (char-after blinkpos))
!                   ?\$)
!               (setq mismatch
!                     (or (null (matching-paren (char-after blinkpos)))
                          (/= (char-after (1- oldpos))
!                             (matching-paren (char-after blinkpos))))))
           (if mismatch (setq blinkpos nil))
           (if blinkpos
               ;; Don't log messages about paren matching.
--- 3515,3534 ----
                   (setq blinkpos (scan-sexps oldpos -1)))
               (error nil)))
           (and blinkpos
!               (save-excursion
!                 (goto-char blinkpos)
!                 (not (looking-at "\\s$")))
!               (setq matching-paren
!                     (or (and parse-sexp-lookup-properties
!                              (let ((prop (get-text-property blinkpos 
'syntax-table)))
!                                (and (consp prop)
!                                     (eq (car prop) 4)
!                                     (cdr prop))))
!                         (matching-paren (char-after blinkpos)))
!                     mismatch
!                     (or (null matching-paren)
                          (/= (char-after (1- oldpos))
!                             matching-paren))))
           (if mismatch (setq blinkpos nil))
           (if blinkpos
               ;; Don't log messages about paren matching.