upstream

1 files changed, 43 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3054f4a284f..8697e70d51d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,44 @@
+2012-05-24  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * window.h (clip_changed): Remove useless declaration.
+
+2012-05-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in: Follow-up to 2012-05-22T16:20:27Z!eggert@cs.ucla.edu.
+        (TAGS, TAGS-gmake, CONFIG_H): Remove further references to m/intel386.h.
+
+2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove src/m/*.
+        This directory predates autoconf and is no longer needed nowadays.
+        Move its few remaining bits of functionality to where they're needed.
+        * m/README, m/alpha.h, m/amdx86-64.h, m/ia64.h, m/ibmrs6000.h:
+        * m/ibms390x.h, m/intel386.h, m/m68k.h, m/macppc.h, m/sparc.h:
+        * m/template.h: Remove.
+        * Makefile.in (M_FILE): Remove.  All uses removed.
+        * alloc.c (POINTERS_MIGHT_HIDE_IN_OBJECTS):
+        * lisp.h (USE_LSB_TAG):
+        * mem-limits.h (EXCEEDS_LISP_PTR):
+        Use VAL_MAX, not VALBITS, in #if.
+        * lisp.h (EMACS_INT_MAX): New macro, useful in #if.
+        (EMACS_UINT): Define unconditionally now.
+        (BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG)
+        (BITS_PER_EMACS_INT): New constants, replacing
+        what used to be in config.h, but not useful in #if.
+        (GCTYPEBITS, VALBITS): Define unconditionally, since m/* files don't
+        define them any more.
+        (VAL_MAX): New macro.
+        (VALMASK): Use it.
+        * puresize.h (PURESIZE_RATIO): Use EMACS_INT_MAX, not
+        BITS_PER_EMACS_INT, in #if.
+        * s/aix4-2.h (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPTY)
+        (BROKEN_SIGPOLL): Move here from m/ibmrs6000.h, which was removed.
+        * s/gnu-linux.h (ULIMIT_BREAK_VALUE) [__i386__]:
+        * s/ms-w32.h (DATA_START):
+        Move here from removed file m/intel386.h.
+        * s/gnu.h (NLIST_STRUCT): Remove undef; 'configure' does this.
+        * s/irix6-5.h (_LP64): Remove; lisp.h no longer needs this.
+
 2012-05-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         Assume C89 or later.
@@ -21,7 +62,7 @@
 2012-05-20  Ken Brown  <kbrown@cornell.edu>
 
         * gmalloc.c (_free_internal_nolock, _realloc_internal_nolock)
-        [CYGWIN]:  Cast ptr to (char *) before comparing to _heapbase.
+        [CYGWIN]: Cast ptr to (char *) before comparing to _heapbase.
 
 2012-05-19  Ken Brown  <kbrown@cornell.edu>
 
@@ -398,7 +439,7 @@
 2012-04-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         Modernize and clean up gmalloc.c to assume C89 (Bug#9119).
-        * gmalloc.c: (_MALLOC_INTERNAL, _MALLOC_H, _PP, __ptr_t)
+        * gmalloc.c (_MALLOC_INTERNAL, _MALLOC_H, _PP, __ptr_t)
         (__malloc_size_t, __malloc_ptrdiff_t):
         Remove.  All uses removed, replaced by the definiens if needed,
         since we can assume C89 or better now.