# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1133106796 0
# Node ID 23ddbc1066551bea3f9bacbec0566893468fa029
# Parent  11c9c1b5284eab893cd7341b5a2d30eac7544752
(blink-matching-open): Ignore `blink-matching-paren-on-screen' if
`show-paren-mode' is enabled.
(blink-matching-paren-on-screen): Update docstring.

diff -r 11c9c1b5284e -r 23ddbc106655 lisp/simple.el
--- a/lisp/simple.el	Sun Nov 27 15:46:32 2005 +0000
+++ b/lisp/simple.el	Sun Nov 27 15:53:16 2005 +0000
@@ -4259,7 +4259,9 @@
 (defcustom blink-matching-paren-on-screen t
   "*Non-nil means show matching open-paren when it is on screen.
 If nil, means don't show it (but the open-paren can still be shown
-when it is off screen)."
+when it is off screen).
+
+This variable is ignored if `show-paren-mode' is enabled."
   :type 'boolean
   :group 'paren-blinking)
 
@@ -4328,10 +4330,11 @@
 	 ((pos-visible-in-window-p blinkpos)
 	  ;; Matching open within window, temporarily move to blinkpos but only
 	  ;; if `blink-matching-paren-on-screen' is non-nil.
-	  (when blink-matching-paren-on-screen
-	    (save-excursion
-	      (goto-char blinkpos)
-	      (sit-for blink-matching-delay))))
+	  (and blink-matching-paren-on-screen
+	       (not show-paren-mode)
+	       (save-excursion
+		 (goto-char blinkpos)
+		 (sit-for blink-matching-delay))))
 	 (t
 	  (save-excursion
 	    (goto-char blinkpos)