From: Paul Eggert Date: Sat, 14 Apr 2012 04:37:44 +0000 (-0700) Subject: Merge from trunk. X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/bdf35b6a6a78e444563a8e321ccb42b4b4a419bd Merge from trunk. --- bdf35b6a6a78e444563a8e321ccb42b4b4a419bd diff --cc ChangeLog index 86a352c4cf,ea71d6e081..a6d4144a01 --- a/ChangeLog +++ b/ChangeLog @@@ -1,20 -1,11 +1,28 @@@ - 2012-04-10 Paul Eggert ++2012-04-14 Paul Eggert + + configure: new option --enable-gcc-warnings (Bug#11207) + I have been using this change for many months in my private copy + of Emacs, and have used it to find several bugs. It's mature + enough to publish now. + * Makefile.in (GNULIB_MODULES): Add warnings, manywarnings. + * configure.in: Support --enable-gcc-warnings, in the style of + other GNU packages such as coreutils. + (C_WARNINGS_SWITCH): Remove, replacing with... + (WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable. + (PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I, + when including system files with GCC. + * etc/NEWS: Mention --enable-gcc-warnings. + * lib/Makefile.am (AM_CFLAGS): New macro. + * m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib. + + 2012-04-12 Ken Brown + + * configure.in: Warn that Cygwin 1.5 is unsupported. (Bug#10398) + + 2012-04-11 Glenn Morris + + * configure.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. + 2012-04-10 Glenn Morris * configure.in: Conditionally generate admin/unidata/Makefile. diff --cc lib-src/ChangeLog index a9ad2a97ea,9ebe8a177a..6c2d23bbf4 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@@ -1,10 -1,8 +1,14 @@@ - 2012-04-09 Paul Eggert -2012-04-14 Juanma Barranquero ++2012-04-14 Paul Eggert + + configure: new option --enable-gcc-warnings (Bug#11207) + * Makefile.in (C_WARNINGS_SWITCH): Remove. + (WARN_CFLAGS, WERROR_CFLAGS): New macros. + (BASE_CFLAGS): Use new macros rather than old. ++2012-04-14 Juanma Barranquero + * emacsclient.c (decode_options) [WINDOWSNT]: + Call ttyname instead of passing its address (typo in 2011-12-04T17:13:01Z!lekktu@gmail.com). + 2012-04-07 Eli Zaretskii * makefile.w32-in (obj): Add xml.o. diff --cc lwlib/ChangeLog index b7751f90a9,8ac9e6994a..85b69f47d2 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@@ -1,10 -1,8 +1,15 @@@ - 2012-04-09 Paul Eggert ++2012-04-14 Paul Eggert + + configure: new option --enable-gcc-warnings (Bug#11207) + * Makefile.in (C_WARNINGS_SWITCH): Remove. + (WARN_CFLAGS, WERROR_CFLAGS): New macros. + (ALL_CFLAGS): Use new macros rather than old. + + 2012-04-11 Glenn Morris + + * Makefile.in (C_SWITCH_X_SYSTEM): Remove. + (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM. + 2011-10-13 Dmitry Antipov * lwlib-Xaw.c (openFont, xaw_destroy_instance): Replace free with diff --cc lwlib/Makefile.in index 76507ac4b2,eda3e2a8f5..d43d9ca211 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@@ -26,12 -26,10 +26,11 @@@ srcdir=@srcdir VPATH=@srcdir@ @SET_MAKE@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ - C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ -C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ PROFILING_CFLAGS = @PROFILING_CFLAGS@ +WARN_CFLAGS = `echo @WARN_CFLAGS@ | sed 's/ -Wwrite-strings//'` +WERROR_CFLAGS = @WERROR_CFLAGS@ CC=@CC@ CFLAGS=@CFLAGS@ @@@ -54,9 -52,8 +53,8 @@@ OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-ut ## $(srcdir) is where the lwlib sources are. ## There are no generated lwlib files, hence no need for -I. ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ - $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(PROFILING_CFLAGS) $(CFLAGS) \ + $(C_SWITCH_MACHINE) \ - $(C_WARNINGS_SWITCH) $(PROFILING_CFLAGS) $(CFLAGS) \ ++ $(WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \ -DHAVE_CONFIG_H -Demacs -I../src \ -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib diff --cc oldXMenu/ChangeLog index 87dadb2745,5b86ccec21..a76ea61abd --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@@ -1,10 -1,8 +1,15 @@@ - 2012-04-09 Paul Eggert ++2012-04-14 Paul Eggert + + configure: new option --enable-gcc-warnings (Bug#11207) + * Makefile.in (C_WARNINGS_SWITCH): Remove. + (WARN_CFLAGS, WERROR_CFLAGS): New macros. + (ALL_CFLAGS): Use new macros rather than old. + + 2012-04-11 Glenn Morris + + * Makefile.in (C_SWITCH_X_SYSTEM): Remove. + (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM. + 2011-04-16 Paul Eggert Static checks with GCC 4.6.0 and non-default toolkits. diff --cc oldXMenu/Makefile.in index e7bc402cb0,f7258d541d..01855f6585 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@@ -1,4 -1,4 +1,4 @@@ --## Makefile for oldXMenu ++## Makefile for oldXMenu ## Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology @@@ -45,12 -45,10 +45,11 @@@ srcdir=@srcdir@ VPATH=@srcdir@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ - C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ -C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ PROFILING_CFLAGS = @PROFILING_CFLAGS@ +WARN_CFLAGS = @WARN_CFLAGS@ +WERROR_CFLAGS = @WERROR_CFLAGS@ EXTRA=insque.o CC=@CC@ @@@ -89,8 -87,8 +88,8 @@@ OBJS = Activate.o all:: libXMenu11.a ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ - $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) ${C_WARNINGS_SWITCH} ${PROFILING_CFLAGS} \ + $(C_SWITCH_X_SITE) \ - ${C_WARNINGS_SWITCH} ${PROFILING_CFLAGS} \ ++ $(WARN_CFLAGS) $(WERROR_CFLAGS) ${PROFILING_CFLAGS} \ $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \ -I../src -I${srcdir} -I${srcdir}/../src diff --cc src/ChangeLog index 2b6a0b2246,6d2ed01baf..20a6dfca64 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,16 -1,44 +1,57 @@@ - 2012-04-10 Paul Eggert ++2012-04-14 Paul Eggert + + configure: new option --enable-gcc-warnings (Bug#11207) + * Makefile.in (C_WARNINGS_SWITCH): Remove. + (WARN_CFLAGS, WERROR_CFLAGS): New macros. + (ALL_CFLAGS): Use new macros rather than old. + * process.c: Ignore -Wstrict-overflow to work around GCC bug 52904. + * regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore + -Wunused-but-set-variable, -Wunused-function, -Wunused-macros, + -Wunused-result, -Wunused-variable. This should go away once + the Emacs and Gnulib regex code is merged. + (xmalloc, xrealloc): Now static. + + 2012-04-14 Atsuo Ohki (tiny change) + + * lread.c (lisp_file_lexically_bound_p): + Fix hang at ";-*-\n" (bug#11238). + + 2012-04-14 Eli Zaretskii + + * xdisp.c (find_last_unchanged_at_beg_row): Don't consider a row + "unchanged" if its end.pos is beyond ZV. (Bug#11199) + + 2012-04-14 Jan Djärv + + * nsterm.m (constrainFrameRect): Always constrain when there is only + one screen (Bug#10962). + + 2012-04-13 Ken Brown + + * s/cygwin.h (PTY_OPEN): Don't try to close a bogus file descriptor. + + 2012-04-13 Reuben Thomas + + * indent.c (Fmove_to_column): Change interactive spec (Bug#739). + + 2012-04-11 Daniel Colascione + + * s/cygwin.h: The vfork the #define in cygwin.h was protecting + against is gone. It's better to use vfork now so that when Cygwin + gains a new, working vfork, we use it automatically (bug#10398). + + 2012-04-11 Stefan Monnier + + * window.c (save_window_save): Obey window-point-insertion-type. + + 2012-04-11 Glenn Morris + + * Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. + + 2012-04-11 Stefan Monnier + + * alloc.c (lisp_align_malloc): Remove unneeded prototype. + 2012-04-10 "Jason S. Cornez" (tiny change) * keyboard.c: Override inhibit-quit after the third C-g (bug#6585).