[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/paren.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/paren.el [emacs-unicode-2] |
Date: |
Wed, 08 Dec 2004 01:48:25 -0500 |
Index: emacs/lisp/paren.el
diff -c emacs/lisp/paren.el:1.54.6.3 emacs/lisp/paren.el:1.54.6.4
*** emacs/lisp/paren.el:1.54.6.3 Fri Nov 12 02:52:53 2004
--- emacs/lisp/paren.el Wed Dec 8 05:02:15 2004
***************
*** 1,6 ****
;;; paren.el --- highlight matching paren
! ;; Copyright (C) 1993, 1996, 2001 Free Software Foundation, Inc.
;; Author: address@hidden
;; Maintainer: FSF
--- 1,6 ----
;;; paren.el --- highlight matching paren
! ;; Copyright (C) 1993, 1996, 2001, 2004 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)))) ?\)) -1)
! ((eq (car (syntax-after (point))) ?\() 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 (car (syntax-after (1- (point)))) 5) -1)
! ((eq (car (syntax-after (point))) 4) 1)))
pos mismatch face)
;;
;; Find the other end of the sexp.
***************
*** 169,179 ****
;; 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)) ?\$)
(setq mismatch
! (not (eq (char-before end)
! ;; This can give nil.
! (matching-paren (char-after beg)))))))))))
;;
;; Highlight the other end of the sexp, or unhighlight if none.
(if (not pos)
--- 169,182 ----
;; 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.
! (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)
***************
*** 246,250 ****
(provide 'paren)
! ;;; arch-tag: d0969b88-7ac0-4bd0-bd53-e73b892b86a9
;;; paren.el ends here
--- 249,253 ----
(provide 'paren)
! ;; arch-tag: d0969b88-7ac0-4bd0-bd53-e73b892b86a9
;;; paren.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/paren.el [emacs-unicode-2],
Miles Bader <=