Now on revision 108322. ------------------------------------------------------------ revno: 108322 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2012-05-21 00:33:54 -0400 message: * lisp/hi-lock.el (hi-lock-face-defaults): Move obsolete before definition. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-21 04:28:41 +0000 +++ lisp/ChangeLog 2012-05-21 04:33:54 +0000 @@ -1,5 +1,7 @@ 2012-05-21 Stefan Monnier + * hi-lock.el (hi-lock-face-defaults): Move obsolete before definition. + * progmodes/compile.el (compilation-error-regexp-alist-alist): Simplify Maven regexp, and make sure the file can't start with a space (bug#11517). @@ -18,10 +20,11 @@ * calc/calc.el (calc-ensure-consistent-units): New variable. - * calc/calc-units.el (math-consistent-units-p, math-check-unit-consistency): - New functions. - (calc-quick-units, calc-convert-units): Use `math-check-unit-consistency' when - `calc-ensure-consistent-units' is non-nil. + * calc/calc-units.el (math-consistent-units-p) + (math-check-unit-consistency): New functions. + (calc-quick-units, calc-convert-units): + Use `math-check-unit-consistency' when `calc-ensure-consistent-units' + is non-nil. (calc-extract-units): Fix typo. 2012-05-18 Stefan Monnier === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2012-01-19 07:21:25 +0000 +++ lisp/hi-lock.el 2012-05-21 04:33:54 +0000 @@ -204,16 +204,15 @@ (defvar hi-lock-interactive-patterns nil "Patterns provided to hi-lock by user. Should not be changed.") +(define-obsolete-variable-alias 'hi-lock-face-history + 'hi-lock-face-defaults "23.1") (defvar hi-lock-face-defaults '("hi-yellow" "hi-pink" "hi-green" "hi-blue" "hi-black-b" "hi-blue-b" "hi-red-b" "hi-green-b" "hi-black-hb") "Default faces for hi-lock interactive functions.") -;(dolist (f hi-lock-face-defaults) (unless (facep f) (error "%s not a face" f))) - -(define-obsolete-variable-alias 'hi-lock-face-history - 'hi-lock-face-defaults - "23.1") +;;(dolist (f hi-lock-face-defaults) +;; (unless (facep f) (error "%s not a face" f))) (define-obsolete-variable-alias 'hi-lock-regexp-history 'regexp-history ------------------------------------------------------------ revno: 108321 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11517 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2012-05-21 00:28:41 -0400 message: * lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): Simplify Maven regexp, and make sure the file can't start with a space. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-21 00:44:34 +0000 +++ lisp/ChangeLog 2012-05-21 04:28:41 +0000 @@ -1,3 +1,9 @@ +2012-05-21 Stefan Monnier + + * progmodes/compile.el (compilation-error-regexp-alist-alist): + Simplify Maven regexp, and make sure the file can't start with a space + (bug#11517). + 2012-05-21 Glenn Morris * Makefile.in (setwins, setwins_almost, setwins_for_subdirs): === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2012-05-18 01:46:20 +0000 +++ lisp/progmodes/compile.el 2012-05-21 04:28:41 +0000 @@ -209,7 +209,7 @@ ;; due to matching filenames via \\(.*?\\). This might be faster. (maven ;; Maven is a popular free software build tool for Java. - "\\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\):\\[\\([0-9]+\\),\\([0-9]+\\)\\] " 1 2 3) + "\\([^ \n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\):\\[\\([0-9]+\\),\\([0-9]+\\)\\] " 1 2 3) (jikes-line "^ *\\([0-9]+\\)\\.[ \t]+.*\n +\\(<-*>\n\\*\\*\\* \\(?:Error\\|Warnin\\(g\\)\\)\\)" === modified file 'test/automated/compile-tests.el' --- test/automated/compile-tests.el 2012-01-05 09:46:05 +0000 +++ test/automated/compile-tests.el 2012-05-21 04:28:41 +0000 @@ -199,6 +199,8 @@ ;; maven ("FooBar.java:[111,53] no interface expected here" 1 53 111 "FooBar.java") + (" [ERROR] /Users/cinsk/hello.java:[651,96] ';' expected" + 15 96 651 "/Users/cinsk/hello.java") ;Bug#11517. ;; mips-1 mips-2 ("TrimMask (255) in solomon.c may be indistinguishable from TrimMasks (93) in solomo.c due to truncation" 11 nil 255 "solomon.c") ------------------------------------------------------------ revno: 108320 committer: Paul Eggert branch nick: trunk timestamp: Sun 2012-05-20 19:33:13 -0700 message: Make merging from gnulib a script, not a makefile action. Putting it in a makefile has some problems with reflection, as merging from gnulib updates 'configure', which can update the makefile. Putting it in a standalone script breaks this loop. * Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4) (GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib): Remove, moving the actions to the script admin/merge-gnulib. * admin/merge-gnulib: New script, with actions moved here from ../Makefile.in. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-21 00:44:34 +0000 +++ ChangeLog 2012-05-21 02:33:13 +0000 @@ -1,3 +1,13 @@ +2012-05-21 Paul Eggert + + Make merging from gnulib a script, not a makefile action. + Putting it in a makefile has some problems with reflection, as + merging from gnulib updates 'configure', which can update the makefile. + Putting it in a standalone script breaks this loop. + * Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4) + (GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib): + Remove, moving the actions to the script admin/merge-gnulib. + 2012-05-21 Glenn Morris * Makefile.in (install-arch-indep, install-doc, install-info) === modified file 'Makefile.in' --- Makefile.in 2012-05-21 00:44:34 +0000 +++ Makefile.in 2012-05-21 02:33:13 +0000 @@ -309,43 +309,6 @@ # and `leim'. lisp leim: src -# Maintainers can put a copy of gnulib into $(gnulib_srcdir). -gnulib_srcdir = ../gnulib -$(gnulib_srcdir): - git clone git://git.savannah.gnu.org/gnulib.git $@ - -# A shorter name that satisfies MS-DOS 8+3 constraints. -DOS_gnulib_comp.m4 = gl-comp.m4 - -# Update modules from gnulib, for maintainers, who should have it in -# $(gnulib_srcdir) (relative to $(srcdir) and should have build tools -# as per $(gnulib_srcdir)/DEPENDENCIES. -GNULIB_MODULES = \ - alloca-opt \ - careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr \ - dup2 \ - filemode getloadavg getopt-gnu ignore-value intprops lstat \ - manywarnings mktime pthread_sigmask readlink \ - socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat \ - warnings -GNULIB_TOOL_FLAGS = \ - --avoid=msvc-inval --avoid=msvc-nothrow \ - --avoid=raise --avoid=threadlib \ - --conditional-dependencies --import --no-changelog --no-vc-files \ - --makefile-name=gnulib.mk -sync-from-gnulib: $(gnulib_srcdir) - -cd $(srcdir)/m4 && cp $(DOS_gnulib_comp.m4) gnulib-comp.m4 - cd $(srcdir) && \ - $(gnulib_srcdir)/gnulib-tool $(GNULIB_TOOL_FLAGS) $(GNULIB_MODULES) - cd $(srcdir)/m4 && rm gnulib-cache.m4 warn-on-use.m4 - cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS_gnulib_comp.m4) - cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc - cp \ - $(gnulib_srcdir)/build-aux/move-if-change \ - $(srcdir)/build-aux - cd $(srcdir) && autoreconf -i -I m4 -.PHONY: sync-from-gnulib - # These targets should be "${SUBDIR} without `src'". lib lib-src lisp leim: Makefile FRC cd $@ && $(MAKE) all $(MFLAGS) \ === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-05-19 18:04:49 +0000 +++ admin/ChangeLog 2012-05-21 02:33:13 +0000 @@ -1,3 +1,9 @@ +2012-05-21 Paul Eggert + + Make merging from gnulib a script, not a makefile action. + * merge-gnulib: New script, with actions moved here from + ../Makefile.in. + 2012-05-19 Paul Eggert * CPP-DEFINES (HAVE_GETDOMAINNAME): Remove. === added file 'admin/merge-gnulib' --- admin/merge-gnulib 1970-01-01 00:00:00 +0000 +++ admin/merge-gnulib 2012-05-21 02:33:13 +0000 @@ -0,0 +1,88 @@ +#! /bin/sh +# Merge gnulib sources into Emacs sources. +# Typical usage: +# +# admin/merge-gnulib + +# Copyright 2012 Free Software Foundation, Inc. + +# This file is part of GNU Emacs. + +# GNU Emacs is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# GNU Emacs is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with GNU Emacs. If not, see . + +# written by Paul Eggert + +GNULIB_URL=git://git.savannah.gnu.org/gnulib.git + +GNULIB_MODULES=' + alloca-opt + careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 + dtoastr dup2 + filemode getloadavg getopt-gnu ignore-value intprops lstat + manywarnings mktime pthread_sigmask readlink + socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat + warnings +' + +GNULIB_TOOL_FLAGS=' + --avoid=msvc-inval --avoid=msvc-nothrow + --avoid=raise --avoid=threadlib + --conditional-dependencies --import --no-changelog --no-vc-files + --makefile-name=gnulib.mk +' + +# The source directory, with a trailing '/'. +# If empty, the source directory is the working directory. +src=$2 +case $src in + */ | '') ;; + *) src=$src/ ;; +esac + +# Gnulib's source directory. +gnulib_srcdir=${1-$src../gnulib} + +case $gnulib_srcdir in + -*) src=- ;; +esac +case $src in + -*) + echo >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]] + + SRCDIR is the Emacs source directory (default: working directory). + GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)." + exit 1 ;; +esac + +test -x "$src"autogen.sh || { + echo >&2 "$0: '${src:-.}' is not an Emacs source directory." + exit 1 +} + +test -d "$gnulib_srcdir" || +git clone -- "$GNULIB_URL" "$gnulib_srcdir" || +exit + +test -x "$gnulib_srcdir"/gnulib-tool || { + echo >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory." + exit 1 +} + +cp -- "$src"m4/gl-comp.m4 "$src"m4/gnulib-comp.m4 && +"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && +rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 && +mv -- "$src"m4/gnulib-comp.m4 "$src"m4/gl-comp.m4 && +cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && +cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && +autoreconf -i -I m4 -- ${src:+"$src"} ------------------------------------------------------------ revno: 108319 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-05-20 17:44:34 -0700 message: Command substitution already runs in a subshell * Makefile.in (install-arch-indep, install-doc, install-info, uninstall): * leim/Makefile.in (leim-list.el, install): * lib-src/Makefile.in (insrcdir, $(DESTDIR)${archlibdir}): * lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs): * test/automated/Makefile.in (setwins): Scrap superfluous subshells. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-19 18:57:10 +0000 +++ ChangeLog 2012-05-21 00:44:34 +0000 @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * Makefile.in (install-arch-indep, install-doc, install-info) + (uninstall): Scrap superfluous subshells. + 2012-05-19 Ulrich Mueller * Makefile.in (install-etc): Respect DESTDIR. (Bug#11518) === modified file 'Makefile.in' --- Makefile.in 2012-05-19 19:17:04 +0000 +++ Makefile.in 2012-05-21 00:44:34 +0000 @@ -529,7 +529,7 @@ [ -d $${dir} ] || exit 1 ; \ dest=$$1 ; shift ; \ [ -d $${dest} ] && \ - [ `(cd $${dest} && /bin/pwd)` = `(cd $${dir} && /bin/pwd)` ] && \ + [ `cd $${dest} && /bin/pwd` = `cd $${dir} && /bin/pwd` ] && \ continue ; \ rm -rf $${dest} ; \ umask 022; ${MKDIR_P} $${dest} ; \ @@ -578,7 +578,7 @@ install-doc: install-arch-indep -unset CDPATH; \ umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \ - if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \ + if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \ then \ fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \ if [ -f "./etc/DOC-$${fullversion}" ]; \ @@ -597,7 +597,7 @@ umask 022; ${MKDIR_P} $(DESTDIR)${infodir} -unset CDPATH; \ thisdir=`/bin/pwd`; \ - [ `(cd ${srcdir}/info && /bin/pwd)` = `(cd $(DESTDIR)${infodir} && /bin/pwd)` ] || \ + [ `cd ${srcdir}/info && /bin/pwd` = `cd $(DESTDIR)${infodir} && /bin/pwd` ] || \ (cd $(DESTDIR)${infodir}; \ [ -f dir ] || \ (cd $${thisdir}; \ @@ -670,8 +670,8 @@ -unset CDPATH; \ for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \ if [ -d $${dir} ]; then \ - case `(cd $${dir} ; /bin/pwd)` in \ - `(cd ${srcdir} ; /bin/pwd)`* ) ;; \ + case `cd $${dir} ; /bin/pwd` in \ + `cd ${srcdir} ; /bin/pwd`* ) ;; \ * ) rm -rf $${dir} ;; \ esac ; \ case $${dir} in \ === modified file 'leim/ChangeLog' --- leim/ChangeLog 2012-05-12 01:19:47 +0000 +++ leim/ChangeLog 2012-05-21 00:44:34 +0000 @@ -1,3 +1,7 @@ +2012-05-21 Glenn Morris + + * Makefile.in (leim-list.el, install): Scrap superfluous subshells. + 2012-05-12 Glenn Morris * Makefile.in (MKDIR_P): New, set by configure. === modified file 'leim/Makefile.in' --- leim/Makefile.in 2012-05-19 19:04:50 +0000 +++ leim/Makefile.in 2012-05-21 00:44:34 +0000 @@ -157,7 +157,7 @@ leim-list.el: ${SUBDIRS} ${TIT_MISC} ${srcdir}/leim-ext.el rm -f leim-list.el - if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \ + if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \ ${RUN_EMACS} -l ${buildlisppath}/international/quail \ --eval "(update-leim-list-file \".\")" ; \ else \ @@ -191,11 +191,11 @@ install: all umask 022; ${MKDIR_P} ${LEIM_INSTALLDIR} - if [ x`(cd ${LEIM_INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \ + if [ x`cd ${LEIM_INSTALLDIR} && /bin/pwd` != x`/bin/pwd` ] ; then \ rm -f ${LEIM_INSTALLDIR}/leim-list.el; \ rm -rf ${LEIM_INSTALLDIR}/quail ${LEIM_INSTALLDIR}/ja-dic ; \ echo "Copying leim files to ${LEIM_INSTALLDIR} ..." ; \ - if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \ + if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \ tar -chf - leim-list.el quail ja-dic \ | (cd ${LEIM_INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ else \ === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-05-18 06:33:04 +0000 +++ lib-src/ChangeLog 2012-05-21 00:44:34 +0000 @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * Makefile.in (insrcdir, $(DESTDIR)${archlibdir}): + Scrap superfluous subshells. + 2012-05-18 Glenn Morris * Makefile.in (install): Ensure $bindir exists. === modified file 'lib-src/Makefile.in' --- lib-src/Makefile.in 2012-05-18 06:33:04 +0000 +++ lib-src/Makefile.in 2012-05-21 00:44:34 +0000 @@ -190,7 +190,7 @@ ## These targets copy the scripts into the build directory so that ## they can be run from there in an uninstalled Emacs. ## Nothing to do if pwd = srcdir. -insrcdir=[ "`/bin/pwd`" = "`(cd $(srcdir) && /bin/pwd)`" ] +insrcdir=[ "`/bin/pwd`" = "`cd $(srcdir) && /bin/pwd`" ] stamp-rcs2log: $(srcdir)/rcs2log $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log @@ -237,7 +237,7 @@ @echo @echo "Installing utilities run internally by Emacs." umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir} - if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \ + if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \ for file in ${UTILITIES}; do \ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \ done ; \ @@ -249,8 +249,8 @@ chown ${gameuser} $(DESTDIR)${gamedir}; \ chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \ fi - if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \ - != `(cd ${srcdir} && /bin/pwd)` ]; then \ + if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` \ + != `cd ${srcdir} && /bin/pwd` ]; then \ for file in ${SCRIPTS}; do \ $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \ done ; \ === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-19 18:28:32 +0000 +++ lisp/ChangeLog 2012-05-21 00:44:34 +0000 @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * Makefile.in (setwins, setwins_almost, setwins_for_subdirs): + Scrap superfluous subshells. + 2012-05-19 Stefan Monnier * emacs-lisp/bytecomp.el (byte-compile-root-dir): New var. === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2012-01-19 07:21:25 +0000 +++ lisp/Makefile.in 2012-05-21 00:44:34 +0000 @@ -106,7 +106,7 @@ emacs = EMACSLOADPATH=$(lisp) LC_ALL=C $(EMACS) $(EMACSOPT) # Common command to find subdirectories -setwins=subdirs=`(find . -type d -print)`; \ +setwins=subdirs=`find . -type d -print`; \ for file in $$subdirs; do \ case $$file in */.* | */.*/* | */=* ) ;; \ *) wins="$$wins $$file" ;; \ @@ -114,7 +114,7 @@ done # Find all subdirectories except `obsolete' and `term'. -setwins_almost=subdirs=`(find . -type d -print)`; \ +setwins_almost=subdirs=`find . -type d -print`; \ for file in $$subdirs; do \ case $$file in */.* | */.*/* | */=* | */obsolete | */term ) ;; \ *) wins="$$wins $$file" ;; \ @@ -122,7 +122,7 @@ done # Find all subdirectories in which we might want to create subdirs.el -setwins_for_subdirs=subdirs=`(find . -type d -print)`; \ +setwins_for_subdirs=subdirs=`find . -type d -print`; \ for file in $$subdirs; do \ case $$file in */.* | */.*/* | */=* | */cedet* ) ;; \ *) wins="$$wins $$file" ;; \ === modified file 'test/ChangeLog' --- test/ChangeLog 2012-05-15 08:52:15 +0000 +++ test/ChangeLog 2012-05-21 00:44:34 +0000 @@ -1,3 +1,7 @@ +2012-05-21 Glenn Morris + + * automated/Makefile.in (setwins): Scrap superfluous subshell. + 2012-05-15 Teodor Zlatanov * automated/url-util-tests.el: New file to test === modified file 'test/automated/Makefile.in' --- test/automated/Makefile.in 2012-01-05 09:46:05 +0000 +++ test/automated/Makefile.in 2012-05-21 00:44:34 +0000 @@ -48,7 +48,7 @@ emacs = EMACSLOADPATH=$(lispsrc):$(test) LC_ALL=C $(EMACS) $(EMACSOPT) # Common command to find subdirectories -setwins=subdirs=`(find . -type d -print)`; \ +setwins=subdirs=`find . -type d -print`; \ for file in $$subdirs; do \ case $$file in */.* | */.*/* | */=* ) ;; \ *) wins="$$wins $$file" ;; \ ------------------------------------------------------------ revno: 108318 committer: Ken Brown branch nick: trunk timestamp: Sun 2012-05-20 08:19:13 -0400 message: Get rid of compiler warnings on Cygwin. * src/gmalloc.c (_free_internal_nolock, _realloc_internal_nolock) [CYGWIN]: Cast ptr to (char *) before comparing to _heapbase. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-19 21:46:43 +0000 +++ src/ChangeLog 2012-05-20 12:19:13 +0000 @@ -1,3 +1,8 @@ +2012-05-20 Ken Brown + + * gmalloc.c (_free_internal_nolock, _realloc_internal_nolock) + [CYGWIN]: Cast ptr to (char *) before comparing to _heapbase. + 2012-05-19 Ken Brown * xfns.c (x_in_use): Remove `static' qualifier. === modified file 'src/gmalloc.c' --- src/gmalloc.c 2012-04-22 19:23:51 +0000 +++ src/gmalloc.c 2012-05-20 12:19:13 +0000 @@ -1004,7 +1004,7 @@ return; #ifdef CYGWIN - if (ptr < _heapbase) + if ((char *) ptr < _heapbase) /* We're being asked to free something in the static heap. */ return; #endif @@ -1341,7 +1341,7 @@ return _malloc_internal_nolock (size); #ifdef CYGWIN - if (ptr < _heapbase) + if ((char *) ptr < _heapbase) /* ptr points into the static heap */ return special_realloc (ptr, size); #endif ------------------------------------------------------------ revno: 108317 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-05-20 06:18:48 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/config.in' --- autogen/config.in 2012-05-19 10:17:29 +0000 +++ autogen/config.in 2012-05-20 10:18:48 +0000 @@ -269,9 +269,6 @@ /* Define to 1 if you have the `getdelim' function. */ #undef HAVE_GETDELIM -/* Define to 1 if you have the `getdomainname' function. */ -#undef HAVE_GETDOMAINNAME - /* Define to 1 if you have the `getgrent' function. */ #undef HAVE_GETGRENT @@ -311,9 +308,6 @@ /* Define to 1 if you have the `getsockname' function. */ #undef HAVE_GETSOCKNAME -/* Define to 1 if you have the `getsockopt' function. */ -#undef HAVE_GETSOCKOPT - /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -540,24 +534,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_MALLOC_H -/* Define to 1 if you have the `mblen' function. */ -#undef HAVE_MBLEN - -/* Define to 1 if you have the `mbrlen' function. */ -#undef HAVE_MBRLEN - -/* Define to 1 if you have the `mbsinit' function. */ -#undef HAVE_MBSINIT - /* Define to 1 if declares mbstate_t. */ #undef HAVE_MBSTATE_T /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if you have the `mempcpy' function. */ -#undef HAVE_MEMPCPY - /* Define to 1 if you have mouse menus. (This is automatic if you use X, but the option to specify it remains.) It is also defined with other window systems that support xmenu.c. */ @@ -575,9 +557,6 @@ /* Define if you have mouse support. */ #undef HAVE_MOUSE -/* Define to 1 if you have the `mremap' function. */ -#undef HAVE_MREMAP - /* Define to 1 if you have the header file. */ #undef HAVE_NET_IF_DL_H @@ -672,9 +651,6 @@ /* Define to 1 if you have the `setsid' function. */ #undef HAVE_SETSID -/* Define to 1 if you have the `setsockopt' function. */ -#undef HAVE_SETSOCKOPT - /* Define to 1 if you have the `shutdown' function. */ #undef HAVE_SHUTDOWN @@ -854,9 +830,6 @@ /* Define to 1 if you have the `tzset' function. */ #undef HAVE_TZSET -/* Define to 1 if you have the `ualarm' function. */ -#undef HAVE_UALARM - /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H @@ -936,9 +909,6 @@ /* Define to 1 if you have the `XScreenResourceString' function. */ #undef HAVE_XSCREENRESOURCESTRING -/* Define to 1 if you have the `XSetWMProtocols' function. */ -#undef HAVE_XSETWMPROTOCOLS - /* Define if you have usable i18n support. */ #undef HAVE_X_I18N === modified file 'autogen/configure' --- autogen/configure 2012-05-19 10:17:29 +0000 +++ autogen/configure 2012-05-20 10:18:48 +0000 @@ -10903,7 +10903,7 @@ fi for ac_func in XrmSetDatabase XScreenResourceString \ -XScreenNumberOfScreen XSetWMProtocols +XScreenNumberOfScreen do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -14312,15 +14312,15 @@ -for ac_func in gethostname getdomainname \ +for ac_func in gethostname \ rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \ random lrand48 logb frexp fmod rint cbrt setsid \ strerror fpathconf select euidaccess getpagesize tzset setlocale \ utimes getrlimit setrlimit setpgid getcwd getwd shutdown getaddrinfo \ -__fpending mblen mbrlen mbsinit strsignal setitimer ualarm \ -sendto recvfrom getsockopt setsockopt getsockname getpeername \ -gai_strerror mkstemp getline getdelim mremap fsync sync \ -difftime mempcpy mblen mbrlen posix_memalign \ +__fpending strsignal setitimer \ +sendto recvfrom getsockname getpeername \ +gai_strerror mkstemp getline getdelim fsync sync \ +difftime posix_memalign \ getpwent endpwent getgrent endgrent \ cfmakeraw cfsetspeed copysign __executable_start do : ------------------------------------------------------------ revno: 108316 committer: Ken Brown branch nick: trunk timestamp: Sat 2012-05-19 17:46:43 -0400 message: Improve test for when xg_select should just invoke select (bug#9754). * src/xfns.c (x_in_use): Remove `static' qualifier. * src/xterm.h (x_in_use): Declare. * src/xgselect.c: Include xterm.h. (xg_select): Test `x_in_use' instead of `inhibit_window_system' and `display_arg'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-19 18:04:49 +0000 +++ src/ChangeLog 2012-05-19 21:46:43 +0000 @@ -1,3 +1,11 @@ +2012-05-19 Ken Brown + + * xfns.c (x_in_use): Remove `static' qualifier. + * xterm.h (x_in_use): Declare. + * xgselect.c: Include xterm.h. + (xg_select): Test `x_in_use' instead of `inhibit_window_system' + and `display_arg' (bug#9754). + 2012-05-19 Paul Eggert * s/ms-w32.h (HAVE_GETDOMAINNAME): Remove; not needed. === modified file 'src/xfns.c' --- src/xfns.c 2012-05-02 10:20:35 +0000 +++ src/xfns.c 2012-05-19 21:46:43 +0000 @@ -136,7 +136,7 @@ /* Nonzero if using X. */ -static int x_in_use; +int x_in_use; static Lisp_Object Qnone; static Lisp_Object Qsuppress_icon; === modified file 'src/xgselect.c' --- src/xgselect.c 2012-05-16 02:22:53 +0000 +++ src/xgselect.c 2012-05-19 21:46:43 +0000 @@ -27,6 +27,7 @@ #include #include #include +#include "xterm.h" static GPollFD *gfds; static ptrdiff_t gfds_size; @@ -43,7 +44,7 @@ int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0; int i, nfds, fds_lim, tmo_in_millisec; - if (inhibit_window_system || !display_arg) + if (!x_in_use) return select (max_fds, rfds, wfds, efds, timeout); if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds)); === modified file 'src/xterm.h' --- src/xterm.h 2012-01-19 07:21:25 +0000 +++ src/xterm.h 2012-05-19 21:46:43 +0000 @@ -1038,6 +1038,7 @@ extern struct x_display_info * check_x_display_info (Lisp_Object); extern Lisp_Object x_get_focus_frame (struct frame *); +extern int x_in_use; #ifdef USE_GTK extern int xg_set_icon (struct frame *, Lisp_Object);