Merge from emacs-24; up to 2012-05-04T19:17:01Z!monnier@iro.umontreal.ca

[gnu-emacs] / lisp / paren.el

diff --git a/lisp/paren.el b/lisp/paren.el
index 783a783338b53757462bf3f3b43f2e781bbf295e..2d6c42478e18453a7e182d0032b2c7f1aeada854 100644 (file)
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -1,7 +1,6 @@
 ;;; paren.el --- highlight matching paren
 
-;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001-2012  Free Software Foundation, Inc.
 
 ;; Author: rms@gnu.org
 ;; Maintainer: FSF
@@ -52,8 +51,7 @@ otherwise)."
   :type '(choice (const parenthesis) (const expression) (const mixed))
   :group 'paren-showing)
 
-(defcustom show-paren-delay
-  (if (featurep 'lisp-float-type) (/ (float 1) (float 8)) 1)
+(defcustom show-paren-delay 0.125
   "Time in seconds to delay before showing a matching paren."
   :type '(number :tag "seconds")
   :group 'paren-showing)
@@ -98,18 +96,20 @@ otherwise)."
   'show-paren-mismatch "22.1")
 
 (defvar show-paren-highlight-openparen t
-  "*Non-nil turns on openparen highlighting when matching forward.")
+  "Non-nil turns on openparen highlighting when matching forward.")
 
 (defvar show-paren-idle-timer nil)
 
 ;;;###autoload
 (define-minor-mode show-paren-mode
-  "Toggle Show Paren mode.
-With prefix ARG, turn Show Paren mode on if and only if ARG is positive.
-Returns the new status of Show Paren mode (non-nil means on).
+  "Toggle visualization of matching parens (Show Paren mode).
+With a prefix argument ARG, enable Show Paren mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil.
 
-When Show Paren mode is enabled, any matching parenthesis is highlighted
-in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
+Show Paren mode is a global minor mode.  When enabled, any
+matching parenthesis is highlighted in `show-paren-style' after
+`show-paren-delay' seconds of Emacs idle time."
   :global t :group 'paren-showing
     ;; Enable or disable the mechanism.
     ;; First get rid of the old idle timer.
@@ -137,13 +137,23 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
 ;; and show it until input arrives.
 (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)
+      (let* ((oldpos (point))
+            (dir (cond ((eq (syntax-class (syntax-after (1- (point)))) 5) -1)
+                       ((eq (syntax-class (syntax-after (point)))      4) 1)))
+            (unescaped
+             (when dir
+               ;; Verify an even number of quoting characters precede the paren.
+               ;; Follow the same logic as in `blink-matching-open'.
+               (= (if (= dir -1) 1 0)
+                  (logand 1 (- (point)
+                               (save-excursion
+                                 (if (= dir -1) (forward-char -1))
+                                 (skip-syntax-backward "/\\")
+                                 (point)))))))
+            pos mismatch face)
        ;;
        ;; Find the other end of the sexp.
-       (when dir
+       (when unescaped
          (save-excursion
            (save-restriction
              ;; Determine the range within which to look for a match.
@@ -253,5 +263,4 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
 
 (provide 'paren)
 
-;; arch-tag: d0969b88-7ac0-4bd0-bd53-e73b892b86a9
 ;;; paren.el ends here