andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
also used in 2-char comment markers.
This commit is contained in:
Stefan Monnier 2005-04-19 18:16:15 +00:00
parent ac43807d0b
commit 95ed7b4249
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/ChangeLog
View file

@ -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>

8
lisp/paren.el
View file

@ -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.