Mercurial > emacs
changeset 67152:23ddbc106655
(blink-matching-open): Ignore `blink-matching-paren-on-screen' if
`show-paren-mode' is enabled.
(blink-matching-paren-on-screen): Update docstring.
| author | Luc Teirlinck <teirllm@auburn.edu> |
|---|---|
| date | Sun, 27 Nov 2005 15:53:16 +0000 |
| parents | 11c9c1b5284e |
| children | 8dc626ffc10d |
| files | lisp/simple.el |
| diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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)