aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2010-09-18 16:23:29 +0200
committerEli Zaretskii2010-09-18 16:23:29 +0200
commit6d7b951302e68d7e7ba7dcbcb78c6ee9ed8293a8 (patch)
treec17395f021f5c1fe3886fe584c29823a27627da8
parent0d4afaf7ffb6d1881c9acf9ef03f386cc87254e6 (diff)
downloademacs-6d7b951302e68d7e7ba7dcbcb78c6ee9ed8293a8.tar.gz
emacs-6d7b951302e68d7e7ba7dcbcb78c6ee9ed8293a8.zip
src/Changelog: Merge two last entries.
-rw-r--r--src/ChangeLog2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 13184191725..ee282e9959a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,8 +2,6 @@
2 2
3 * deps.mk (xml.o): Add dependencies. 3 * deps.mk (xml.o): Add dependencies.
4 4
52010-09-18 Eli Zaretskii <eliz@gnu.org>
6
7 * xdisp.c (Fcurrent_bidi_paragraph_direction): Call 5 * xdisp.c (Fcurrent_bidi_paragraph_direction): Call
8 bidi_paragraph_init with NO_DEFAULT_P non-zero. (Bug#7038) 6 bidi_paragraph_init with NO_DEFAULT_P non-zero. (Bug#7038)
9 7