summaryrefslogtreecommitdiff
path: root/doc/lispref/ChangeLog
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina <fgallina@gnu.org>2014-12-27 14:15:05 -0300
committerFabián Ezequiel Gallina <fgallina@gnu.org>2014-12-27 14:35:26 -0300
commit848343f3467fdb14d407865babb9c71683128618 (patch)
treeea82ccfc5ec3cd74898841502ca8a4c0c522d95d /doc/lispref/ChangeLog
parent35e1f9d9fcbaab51808e05f514e63927f959ae51 (diff)
downloademacs-848343f3467fdb14d407865babb9c71683128618.tar.gz
Sanitize ChangeLog entries for previous merges.
Diffstat (limited to 'doc/lispref/ChangeLog')
-rw-r--r--doc/lispref/ChangeLog8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index feafee89241..ad9af13488e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -5,7 +5,6 @@
* modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
2014-12-27 Eli Zaretskii <eliz@gnu.org>
-2014-12-27 Eli Zaretskii <eliz@gnu.org>
* windows.texi (Recombining Windows): Index subject of sections.
@@ -106,7 +105,6 @@
* os.texi (Time of Day, Time Conversion, Time Parsing)
(Time Calculations, Idle Timers): Index subject of sections.
-2014-12-27 Stefan Monnier <monnier@iro.umontreal.ca>
2014-12-25 Martin Rudalics <rudalics@gmx.at>
* windows.texi (Windows): Resync @menu order with @node order.
@@ -146,6 +144,12 @@
* display.texi (Low-Level Font): Document font-info and query-font.
+2014-12-18 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * display.texi (Forcing Redisplay): Remove references to
+ redisplay-dont-pause and redisplay-preemption-period (which doesn't
+ even exist).
+
2014-12-16 Nicolas Petton <petton.nicolas@gmail.com>
* sequences.texi (Seq Library): Add documentation for seq.el.