aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2005-11-27 15:54:28 +0000
committerLuc Teirlinck2005-11-27 15:54:28 +0000
commit965cd29a27fe16fa6b30defb93bc73f8d74b7fa6 (patch)
tree5ec132f6faf22c52a09f47a50f43cdc99b183283
parent92aa8a331eebc331d6914fa9474c2b05661ec832 (diff)
downloademacs-965cd29a27fe16fa6b30defb93bc73f8d74b7fa6.tar.gz
emacs-965cd29a27fe16fa6b30defb93bc73f8d74b7fa6.zip
(show-paren-mode): No longer change `blink-matching-paren-on-screen'.
-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).
110When Show Paren mode is enabled, any matching parenthesis is highlighted 110When Show Paren mode is enabled, any matching parenthesis is highlighted
111in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time." 111in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
112 :global t :group 'paren-showing 112 :global t :group 'paren-showing
113 ;; Turn off the usual paren-matching method 113 ;; Enable or disable the mechanism.
114 ;; when this one is turned on.
115 (if (local-variable-p 'show-paren-mode)
116 (make-local-variable 'blink-matching-paren-on-screen)
117 (kill-local-variable 'blink-matching-paren-on-screen))
118 (setq blink-matching-paren-on-screen (not show-paren-mode))
119
120 ;; Now enable or disable the mechanism.
121 ;; First get rid of the old idle timer. 114 ;; First get rid of the old idle timer.
122 (if show-paren-idle-timer 115 (if show-paren-idle-timer
123 (cancel-timer show-paren-idle-timer)) 116 (cancel-timer show-paren-idle-timer))