Add support for client certificates for built-in and external STARTTLS.

[gnu-emacs] / lisp / paren.el

diff --git a/lisp/paren.el b/lisp/paren.el
index 041f43e1fbcd339cc406dc417c8dae8a97ef8c94..8bd96b9317ad7e05d649357d08b9bf09d701c419 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 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001-2011  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)
@@ -87,16 +85,15 @@ otherwise)."
      :background "gray"))
   "Show Paren mode face used for a matching paren."
   :group 'paren-showing-faces)
-;; backward-compatibility alias
-(put 'show-paren-match-face 'face-alias 'show-paren-match)
+(define-obsolete-face-alias 'show-paren-match-face 'show-paren-match "22.1")
 
 (defface show-paren-mismatch
   '((((class color)) (:foreground "white" :background "purple"))
     (t (:inverse-video t)))
   "Show Paren mode face used for a mismatching paren."
   :group 'paren-showing-faces)
-;; backward-compatibility alias
-(put 'show-paren-mismatch-face 'face-alias 'show-paren-mismatch)
+(define-obsolete-face-alias 'show-paren-mismatch-face
+  'show-paren-mismatch "22.1")
 
 (defvar show-paren-highlight-openparen t
   "*Non-nil turns on openparen highlighting when matching forward.")
@@ -212,9 +209,9 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
                (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))
@@ -238,7 +235,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
                          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 nil t))))
@@ -254,5 +251,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