summaryrefslogtreecommitdiff
path: root/lisp/paren.el
diff options
context:
space:
mode:
authorLuc Teirlinck <teirllm@auburn.edu>2005-11-27 15:54:28 +0000
committerLuc Teirlinck <teirllm@auburn.edu>2005-11-27 15:54:28 +0000
commit965cd29a27fe16fa6b30defb93bc73f8d74b7fa6 (patch)
tree5ec132f6faf22c52a09f47a50f43cdc99b183283 /lisp/paren.el
parent92aa8a331eebc331d6914fa9474c2b05661ec832 (diff)
downloademacs-965cd29a27fe16fa6b30defb93bc73f8d74b7fa6.tar.gz
(show-paren-mode): No longer change `blink-matching-paren-on-screen'.
Diffstat (limited to 'lisp/paren.el')
-rw-r--r--lisp/paren.el9
1 files changed, 1 insertions, 8 deletions
diff --git a/lisp/paren.el b/lisp/paren.el
index ece3ed3c606..2164ac72d39 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -110,14 +110,7 @@ Returns the new status of Show Paren mode (non-nil means on).
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))