[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 848343f 10/10: Sanitize ChangeLog entries for previ
From: |
Fabián Ezequiel Gallina |
Subject: |
[Emacs-diffs] master 848343f 10/10: Sanitize ChangeLog entries for previous merges. |
Date: |
Sat, 27 Dec 2014 18:50:46 +0000 |
branch: master
commit 848343f3467fdb14d407865babb9c71683128618
Author: Fabián Ezequiel Gallina <address@hidden>
Commit: Fabián Ezequiel Gallina <address@hidden>
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 dd0875e..65a112d 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 <address@hidden>
2014-12-25 Paul Eggert <address@hidden>
Prefer stpcpy to strcat
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b9ca8b3..0016ee0 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -2,7 +2,6 @@
* buffers.texi (Kill Buffer): Improve indexing.
-2014-12-27 Paul Eggert <address@hidden>
2014-12-24 Stephen Leake <address@hidden>
* trouble.texi: Move user-level information from CONTRIBUTE here.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index feafee8..ad9af13 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 <address@hidden>
-2014-12-27 Eli Zaretskii <address@hidden>
* 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 <address@hidden>
2014-12-25 Martin Rudalics <address@hidden>
* 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 <address@hidden>
+
+ * display.texi (Forcing Redisplay): Remove references to
+ redisplay-dont-pause and redisplay-preemption-period (which doesn't
+ even exist).
+
2014-12-16 Nicolas Petton <address@hidden>
* sequences.texi (Seq Library): Add documentation for seq.el.
diff --git a/etc/ChangeLog b/etc/ChangeLog
index f94db9a..ee0958f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -2,7 +2,6 @@
* tutorials/TUTORIAL.es: Improve style consistency. Spelling fixes.
-2014-12-27 Paul Eggert <address@hidden>
2014-12-25 Karl Fogel <address@hidden>
* NEWS: Mention new buffer display behavior for `shell'.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e1f9e6..9319229 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -34,7 +34,6 @@
(python-info-encoding): New functions.
2014-12-27 Michael Albinus <address@hidden>
-2014-12-27 Michael Albinus <address@hidden>
* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
Use `tramp-rsh-end-of-line', it ought to be more robust.
@@ -79,18 +78,14 @@
Set `find-file-not-found-functions' in case of errors. (Bug#18623)
2014-12-27 Michael Albinus <address@hidden>
-2014-12-27 Michael Albinus <address@hidden>
* net/tramp-sh.el (tramp-send-command-and-read): New optional
arg MARKER.
(tramp-get-remote-path): Use it.
2014-12-27 Stefan Monnier <address@hidden>
-2014-12-27 Michael Albinus <address@hidden>
- * 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 <address@hidden>
@@ -121,7 +116,6 @@
* textmodes/tex-mode.el (tex-insert-quote): Consider and respect
`electric-pair-mode' (bug#19356).
-2014-12-27 Michael Albinus <address@hidden>
2014-12-27 Dmitry Gutov <address@hidden>
elisp-xref-find: Don't create buffers eagerly.
diff --git a/src/ChangeLog b/src/ChangeLog
index 2d9408b..c32b120 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 <address@hidden>
* xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert
- [Emacs-diffs] master updated (6d14e0d -> 848343f), Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master cd1ed48 02/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 6e66744 03/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master c3c51ec 04/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 938d651 06/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 3a12f2e 01/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 4b72b4f 07/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master f315b69 08/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 848343f 10/10: Sanitize ChangeLog entries for previous merges.,
Fabián Ezequiel Gallina <=
- [Emacs-diffs] master 411c1c6 05/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 35e1f9d 09/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27