From: Luc Teirlinck <teirllm@auburn.edu>
Date: Sun, 27 Nov 2005 15:37:54 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~5653
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb0a2595f5c7ea5c9fed8817d103f7a26a7b0ebb;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2ff14b82d2..4f56d227bd0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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)