Merge from emacs-23

[bpt/emacs.git] / lisp / paren.el

diff --git a/lisp/paren.el b/lisp/paren.el
index a33f464..7f8b33b 100644 (file)
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -52,8 +52,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)
@@ -253,5 +252,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