summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorLuc Teirlinck <teirllm@auburn.edu>2005-11-27 15:37:54 +0000
committerLuc Teirlinck <teirllm@auburn.edu>2005-11-27 15:37:54 +0000
commitcb0a2595f5c7ea5c9fed8817d103f7a26a7b0ebb (patch)
tree7806ca370ba1044141c2854ac75cf49603c9ef81 /lisp
parent4932253962f5aa986f0d43fb41bc97b81241fc91 (diff)
downloademacs-cb0a2595f5c7ea5c9fed8817d103f7a26a7b0ebb.tar.gz
emacs-cb0a2595f5c7ea5c9fed8817d103f7a26a7b0ebb.tar.bz2
emacs-cb0a2595f5c7ea5c9fed8817d103f7a26a7b0ebb.zip
*** empty log message ***
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog9
1 files changed, 9 insertions, 0 deletions
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)