[Emacs-diffs] Changes to emacs/lisp/simple.el

[Luc Teirlinck]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.770 emacs/lisp/simple.el:1.771
*** emacs/lisp/simple.el:1.770  Wed Nov 23 15:05:18 2005
--- emacs/lisp/simple.el        Sun Nov 27 15:53:16 2005
***************
*** 4259,4265 ****
  (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)."
    :type 'boolean
    :group 'paren-blinking)
  
--- 4259,4267 ----
  (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).
! 
! This variable is ignored if `show-paren-mode' is enabled."
    :type 'boolean
    :group 'paren-blinking)
  
***************
*** 4328,4337 ****
         ((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))))
         (t
          (save-excursion
            (goto-char blinkpos)
--- 4330,4340 ----
         ((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.
!         (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)