From 848343f3467fdb14d407865babb9c71683128618 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Sat, 27 Dec 2014 14:15:05 -0300 Subject: [PATCH] Sanitize ChangeLog entries for previous merges. --- ChangeLog | 1 - doc/emacs/ChangeLog | 1 - doc/lispref/ChangeLog | 8 ++++++-- etc/ChangeLog | 1 - lisp/ChangeLog | 8 +------- src/ChangeLog | 1 + 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd0875e82d6..65a112d379f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,6 @@ * build-aux/git-hooks/commit-msg (at_sign): Bump up line-length limit to 78. -2014-12-27 Paul Eggert 2014-12-25 Paul Eggert Prefer stpcpy to strcat diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b9ca8b39fd3..0016ee074ad 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -2,7 +2,6 @@ * buffers.texi (Kill Buffer): Improve indexing. -2014-12-27 Paul Eggert 2014-12-24 Stephen Leake * trouble.texi: Move user-level information from CONTRIBUTE here. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index feafee89241..ad9af13488e 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -4,7 +4,6 @@ * os.texi (Desktop Notifications): * modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes. -2014-12-27 Eli Zaretskii 2014-12-27 Eli Zaretskii * 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 2014-12-25 Martin Rudalics * 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 + + * display.texi (Forcing Redisplay): Remove references to + redisplay-dont-pause and redisplay-preemption-period (which doesn't + even exist). + 2014-12-16 Nicolas Petton * sequences.texi (Seq Library): Add documentation for seq.el. diff --git a/etc/ChangeLog b/etc/ChangeLog index f94db9aa571..ee0958fedb1 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -2,7 +2,6 @@ * tutorials/TUTORIAL.es: Improve style consistency. Spelling fixes. -2014-12-27 Paul Eggert 2014-12-25 Karl Fogel * NEWS: Mention new buffer display behavior for `shell'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2e1f9e612eb..9319229a083 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -33,7 +33,6 @@ (python-info-encoding-from-cookie) (python-info-encoding): New functions. -2014-12-27 Michael Albinus 2014-12-27 Michael Albinus * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): @@ -78,7 +77,6 @@ * net/tramp.el (tramp-handle-insert-file-contents): Set `find-file-not-found-functions' in case of errors. (Bug#18623) -2014-12-27 Michael Albinus 2014-12-27 Michael Albinus * net/tramp-sh.el (tramp-send-command-and-read): New optional @@ -86,11 +84,8 @@ (tramp-get-remote-path): Use it. 2014-12-27 Stefan Monnier -2014-12-27 Michael Albinus - * net/tramp-sh.el (tramp-send-command-and-read): New optional - arg MARKER. - (tramp-get-remote-path): Use it. + * lisp/subr.el (redisplay-dont-pause): Mark as obsolete. 2014-12-27 Michael Albinus @@ -121,7 +116,6 @@ * textmodes/tex-mode.el (tex-insert-quote): Consider and respect `electric-pair-mode' (bug#19356). -2014-12-27 Michael Albinus 2014-12-27 Dmitry Gutov elisp-xref-find: Don't create buffers eagerly. diff --git a/src/ChangeLog b/src/ChangeLog index 2d9408bf468..c32b1209ae7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -19,6 +19,7 @@ set (Bug#19133). (setPixmapData): Rename local variable bmRep to avoid compiler warning. + 2014-12-27 Jan Djärv * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert -- 2.39.2