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

[Luc Teirlinck]

Index: emacs/lisp/paren.el
diff -c emacs/lisp/paren.el:1.65 emacs/lisp/paren.el:1.66
*** emacs/lisp/paren.el:1.65    Sun Nov 20 18:07:19 2005
--- emacs/lisp/paren.el Sun Nov 27 15:54:28 2005
***************
*** 110,123 ****
  When Show Paren mode is enabled, any matching parenthesis is highlighted
  in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
    :global t :group 'paren-showing
!     ;; Turn off the usual paren-matching method
!     ;; when this one is turned on.
!     (if (local-variable-p 'show-paren-mode)
!       (make-local-variable 'blink-matching-paren-on-screen)
!       (kill-local-variable 'blink-matching-paren-on-screen))
!     (setq blink-matching-paren-on-screen (not show-paren-mode))
! 
!     ;; Now enable or disable the mechanism.
      ;; First get rid of the old idle timer.
      (if show-paren-idle-timer
        (cancel-timer show-paren-idle-timer))
--- 110,116 ----
  When Show Paren mode is enabled, any matching parenthesis is highlighted
  in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
    :global t :group 'paren-showing
!     ;; Enable or disable the mechanism.
      ;; First get rid of the old idle timer.
      (if show-paren-idle-timer
        (cancel-timer show-paren-idle-timer))