From: Luc Teirlinck <teirllm@auburn.edu>
Date: Sun, 27 Nov 2005 15:53:16 +0000 (+0000)
Subject: (blink-matching-open): Ignore `blink-matching-paren-on-screen' if
X-Git-Tag: emacs-pretest-22.0.90~5651
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=92aa8a331eebc331d6914fa9474c2b05661ec832;p=emacs.git

(blink-matching-open): Ignore `blink-matching-paren-on-screen' if
`show-paren-mode' is enabled.
(blink-matching-paren-on-screen): Update docstring.
---

diff --git a/lisp/simple.el b/lisp/simple.el
index 9b42c756991..36f6be2f10a 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4259,7 +4259,9 @@ of the buffer appears in the mode line."
 (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 @@ If nil, search stops at the beginning of the accessible portion of the buffer."
 	 ((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)