resolve ChangeLog merge conflict

2 files changed, 6 insertions, 2 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 5b3750697c8..3621c563d79 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove obsolete references to pre-C99 builds
+        * internals.texi (C Integer Types): Don't mention pre-C99 compilers.
+
 2014-12-19  Martin Rudalics  <rudalics@gmx.at>
 
         * windows.texi (Resizing Windows): Describe new argument of
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index db6ed41268c..092ec003fb5 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -1684,8 +1684,7 @@ using @code{int}.  Although it is also OK to use @code{int}, @code{0}
 and @code{1}, this older style is gradually being phased out.  When
 using @code{bool}, respect the limitations of the replacement
 implementation of @code{bool}, as documented in the source file
-@file{lib/stdbool.in.h}, so that Emacs remains portable to pre-C99
-platforms.  In particular, boolean bitfields should be of type
+@file{lib/stdbool.in.h}.  In particular, boolean bitfields should be of type
 @code{bool_bf}, not @code{bool}, so that they work correctly even when
 compiling Objective C with standard GCC.