;;; paren.el --- highlight matching paren
-;; Copyright (C) 1993, 1996, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Author: rms@gnu.org
;; Maintainer: FSF
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
(defvar show-paren-overlay-1 nil)
(defcustom show-paren-style 'parenthesis
- "*Style used when showing a matching paren.
+ "Style used when showing a matching paren.
Valid styles are `parenthesis' (meaning show the matching paren),
`expression' (meaning show the entire expression enclosed by the paren) and
`mixed' (meaning show the matching paren if it is visible, and the expression
(defcustom show-paren-delay
(if (featurep 'lisp-float-type) (/ (float 1) (float 8)) 1)
- "*Time in seconds to delay before showing a matching paren."
+ "Time in seconds to delay before showing a matching paren."
:type '(number :tag "seconds")
:group 'paren-showing)
(defcustom show-paren-priority 1000
- "*Priority of paren highlighting overlays."
+ "Priority of paren highlighting overlays."
:type 'integer
:group 'paren-showing
:version "21.1")
(defcustom show-paren-ring-bell-on-mismatch nil
- "*If non-nil, beep if mismatched paren is detected."
+ "If non-nil, beep if mismatched paren is detected."
:type 'boolean
:group 'paren-showing
:version "20.3")
-(defface show-paren-match-face
+(defgroup paren-showing-faces nil
+ "Group for faces of Show Paren mode."
+ :group 'paren-showing
+ :group 'faces
+ :version "22.1")
+
+(defface show-paren-match
'((((class color) (background light))
:background "turquoise") ; looks OK on tty (becomes cyan)
(((class color) (background dark))
(t
:background "gray"))
"Show Paren mode face used for a matching paren."
- :group 'faces
- :group 'paren-showing)
+ :group 'paren-showing-faces)
+;; backward-compatibility alias
+(put 'show-paren-match-face 'face-alias 'show-paren-match)
-(defface show-paren-mismatch-face
+(defface show-paren-mismatch
'((((class color)) (:foreground "white" :background "purple"))
(t (:inverse-video t)))
"Show Paren mode face used for a mismatching paren."
- :group 'faces
- :group 'paren-showing)
+ :group 'paren-showing-faces)
+;; backward-compatibility alias
+(put 'show-paren-mismatch-face 'face-alias 'show-paren-mismatch)
(defvar show-paren-highlight-openparen t
"*Non-nil turns on openparen highlighting when matching forward.")
When Show Paren mode is enabled, any matching parenthesis is highlighted
in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
:global t :group 'paren-showing
- ;; Turn off the usual paren-matching method
- ;; when this one is turned on.
- (if (local-variable-p 'show-paren-mode)
- (make-local-variable 'blink-matching-paren-on-screen)
- (kill-local-variable 'blink-matching-paren-on-screen))
- (setq blink-matching-paren-on-screen (not show-paren-mode))
-
- ;; Now enable or disable the mechanism.
+ ;; Enable or disable the mechanism.
;; First get rid of the old idle timer.
(if show-paren-idle-timer
(cancel-timer show-paren-idle-timer))
(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.
;; 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.
(cdr (syntax-after beg)))
(eq (char-after beg)
;; This can give nil.
- (cdr (syntax-after (1- end)))))))))))))
+ (cdr (syntax-after (1- end))))
+ ;; The cdr might hold a new paren-class
+ ;; info rather than a matching-char info,
+ ;; in which case the two CDRs should match.
+ (eq (cdr (syntax-after (1- end)))
+ (cdr (syntax-after beg))))))))))))
;;
;; Highlight the other end of the sexp, or unhighlight if none.
(if (not pos)
(progn
(if show-paren-ring-bell-on-mismatch
(beep))
- (setq face 'show-paren-mismatch-face))
- (setq face 'show-paren-match-face))
+ (setq face 'show-paren-mismatch))
+ (setq face 'show-paren-match))
;;
;; If matching backwards, highlight the closeparen
;; before point as well as its matching open.
(delete-overlay show-paren-overlay-1))
(let ((from (if (= dir 1)
(point)
- (forward-point -1)))
+ (- (point) 1)))
(to (if (= dir 1)
- (forward-point 1)
+ (+ (point) 1)
(point))))
(if show-paren-overlay-1
(move-overlay show-paren-overlay-1 from to (current-buffer))
- (setq show-paren-overlay-1 (make-overlay from to)))
+ (setq show-paren-overlay-1 (make-overlay from to nil t)))
;; Always set the overlay face, since it varies.
(overlay-put show-paren-overlay-1 'priority show-paren-priority)
(overlay-put show-paren-overlay-1 'face face)))
pos
(save-excursion
(goto-char pos)
- (forward-point (- dir))))))
+ (- (point) dir)))))
(if show-paren-overlay
(move-overlay show-paren-overlay from to (current-buffer))
- (setq show-paren-overlay (make-overlay from to))))
+ (setq show-paren-overlay (make-overlay from to nil t))))
;;
;; Always set the overlay face, since it varies.
(overlay-put show-paren-overlay 'priority show-paren-priority)