# HG changeset patch # User Luc Teirlinck # Date 1133106868 0 # Node ID 8dc626ffc10d51b03a6cc5a766c6a16331f79b10 # Parent 23ddbc1066551bea3f9bacbec0566893468fa029 (show-paren-mode): No longer change `blink-matching-paren-on-screen'. diff -r 23ddbc106655 -r 8dc626ffc10d lisp/paren.el --- a/lisp/paren.el Sun Nov 27 15:53:16 2005 +0000 +++ b/lisp/paren.el Sun Nov 27 15:54:28 2005 +0000 @@ -110,14 +110,7 @@ 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))