# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1133105874 0
# Node ID 711dd29dd3d211b7c8a10b607f2c22d7dd82d150
# Parent  74532eba8fc4a2e75b140a9721a3fd76e09cce2b
*** empty log message ***

diff -r 74532eba8fc4 -r 711dd29dd3d2 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Nov 27 03:24:25 2005 +0000
+++ b/lisp/ChangeLog	Sun Nov 27 15:37:54 2005 +0000
@@ -1,3 +1,12 @@
+2005-11-27  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* simple.el (blink-matching-open): Ignore
+	`blink-matching-paren-on-screen' if `show-paren-mode' is enabled.
+	Mention this in the docstring.
+
+	* paren.el (show-paren-mode): No longer change
+	`blink-matching-paren-on-screen'.
+
 2005-11-27  John Paul Wallington  <jpw@pobox.com>
 
 	* progmodes/gdb-ui.el (gdb-goto-breakpoint, gdb-frames-select)