From: Luc Teirlinck <teirllm@auburn.edu>
Date: Sun, 27 Nov 2005 15:54:28 +0000 (+0000)
Subject: (show-paren-mode): No longer change `blink-matching-paren-on-screen'.
X-Git-Tag: emacs-pretest-22.0.90~5650
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=965cd29a27fe16fa6b30defb93bc73f8d74b7fa6;p=emacs.git

(show-paren-mode): No longer change `blink-matching-paren-on-screen'.
---

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))