summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/paren.el9
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/paren.el b/lisp/paren.el
index e42751c706e..1c517bdf500 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -125,7 +125,14 @@
(progn
(setq blink-paren-function nil)
(add-hook 'post-command-hook 'show-paren-command-hook)))
-
+;;; This is in case paren.el is preloaded.
+(add-hook 'window-setup-hook
+ (function (lambda ()
+ (if window-system
+ (progn
+ (setq blink-paren-function nil)
+ (add-hook 'post-command-hook
+ 'show-paren-command-hook))))))
(provide 'paren)
;;; paren.el ends here