summaryrefslogtreecommitdiff
path: root/lisp/paren.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/paren.el')
-rw-r--r--lisp/paren.el15
1 files changed, 12 insertions, 3 deletions
diff --git a/lisp/paren.el b/lisp/paren.el
index ee550228d48..ab856380d3f 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -1,6 +1,6 @@
;;; paren.el --- highlight matching paren
-;; Copyright (C) 1993, 1996, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001-2012 Free Software Foundation, Inc.
;; Author: rms@gnu.org
;; Maintainer: FSF
@@ -52,8 +52,17 @@ otherwise)."
:group 'paren-showing)
(defcustom show-paren-delay 0.125
- "Time in seconds to delay before showing a matching paren."
+ "Time in seconds to delay before showing a matching paren.
+If you change this without using customize while `show-paren-mode' is
+active, you must toggle the mode off and on again for this to take effect."
:type '(number :tag "seconds")
+ :initialize 'custom-initialize-default
+ :set (lambda (sym val)
+ (if (not show-paren-mode)
+ (set sym val)
+ (show-paren-mode -1)
+ (set sym val)
+ (show-paren-mode 1)))
:group 'paren-showing)
(defcustom show-paren-priority 1000
@@ -96,7 +105,7 @@ 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)