1 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5498a07a0da..50f5fb8ca1e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-09-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify lisp.h by removing the __COUNTER__ business.
+        Problem reported by Dmitry Antipov in:
+        http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00220.html
+        * lisp.h (make_local_vector, make_local_string)
+        (build_local_string): Simplify by not bothering with __COUNTER__.
+        The __COUNTER__ business wasn't working properly, and was needed
+        only for hypothetical future expansion anyway.
+
 2014-09-10  Alp Aker  <alp.tekin.aker@gmail.com>
 
         * nsterm.m (ns_draw_fringe_bitmap): Use the same logic as other