Merge from emacs-24; up to 2012-12-10T20:27:33Z!eggert@cs.ucla.edu

[bpt/emacs.git] / oldXMenu / ChangeLog

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 133b18b..8f29517 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,14 @@
+2012-12-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Include <config.h> uniformly in oldXMenu sources.
+       * Activate.c, AddPane.c, AddSel.c, ChgPane.c, ChgSel.c, Create.c:
+       * InsPane.c, InsSel.c, Internal.c, XMakeAssoc.c:
+       Do not include <config.h>, since XMenuInt.h does that now.
+       * XLookAssoc.c, XMenuInt.h: Include <config.h>.
+       This avoids a build failure when configuring on Fedora 17
+       --with-x-toolkit=no, reported by Dmitry Andropov in
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00078.html>.
+
 2012-10-06  Ulrich Müller  <ulm@gentoo.org>
 
        * Makefile.in (AR, ARFLAGS): Get values from configure.
@@ -638,7 +649,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.