Now on revision 109688. ------------------------------------------------------------ revno: 109688 committer: Paul Eggert branch nick: trunk timestamp: Sun 2012-08-19 21:04:58 -0700 message: Clarify recent ChangeLog entry. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-08-19 21:00:09 +0000 +++ lib-src/ChangeLog 2012-08-20 04:04:58 +0000 @@ -1,6 +1,6 @@ 2012-08-19 Paul Eggert - Rely on to declare 'environ'. + Rely on + to declare 'environ'. * emacsclient.c (environ): Remove decl. 2012-08-17 Juanma Barranquero === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-20 01:28:35 +0000 +++ src/ChangeLog 2012-08-20 04:04:58 +0000 @@ -4,7 +4,7 @@ 2012-08-19 Paul Eggert - Rely on to declare 'environ', + Rely on + to declare 'environ', as gnulib does this if the system doesn't. * callproc.c, editfns.c, process.c (environ) [!USE_CRT_DLL]: * emacs.c (environ) [DOUG_LEA_MALLOC]: ------------------------------------------------------------ revno: 109687 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2012-08-20 03:28:35 +0200 message: src/makefile.w32-in ($(BLD)/vm-limit.$(O)): Update dependencies. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-19 21:00:09 +0000 +++ src/ChangeLog 2012-08-20 01:28:35 +0000 @@ -1,3 +1,7 @@ +2012-08-20 Juanma Barranquero + + * makefile.w32-in ($(BLD)/vm-limit.$(O)): Update dependencies. + 2012-08-19 Paul Eggert Rely on to declare 'environ', === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2012-08-17 01:53:29 +0000 +++ src/makefile.w32-in 2012-08-20 01:28:35 +0000 @@ -1448,6 +1448,7 @@ $(BLD)/vm-limit.$(O) : \ $(SRC)/vm-limit.c \ $(SRC)/mem-limits.h \ + $(NT_INC)/unistd.h \ $(CONFIG_H) \ $(LISP_H) ------------------------------------------------------------ revno: 109686 committer: Paul Eggert branch nick: trunk timestamp: Sun 2012-08-19 16:31:24 -0700 message: Merge from gnulib. 2012-08-19 ignore-value, stat-time, timespec: omit AC_C_INLINE 2012-08-19 mktime, sys_select: avoid 'static inline' 2012-08-19 gnulib-tool: Fix indentation. diff: === modified file 'ChangeLog' --- ChangeLog 2012-08-18 21:36:13 +0000 +++ ChangeLog 2012-08-19 23:31:24 +0000 @@ -1,3 +1,10 @@ +2012-08-19 Paul Eggert + + Merge from gnulib, incorporating: + 2012-08-19 ignore-value, stat-time, timespec: omit AC_C_INLINE + 2012-08-19 mktime, sys_select: avoid 'static inline' + 2012-08-19 gnulib-tool: Fix indentation. + 2012-08-18 Paul Eggert * lib/sigprocmask.c, m4/signalblocking.m4: Remove. === modified file 'lib/gnulib.mk' --- lib/gnulib.mk 2012-08-02 04:46:10 +0000 +++ lib/gnulib.mk 2012-08-19 23:31:24 +0000 @@ -21,7 +21,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign stdarg stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timespec-add timespec-sub utimens warnings +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timespec-add timespec-sub utimens warnings MOSTLYCLEANFILES += core *.stackdump === modified file 'lib/mktime.c' --- lib/mktime.c 2012-05-26 23:14:36 +0000 +++ lib/mktime.c 2012-08-19 23:31:24 +0000 @@ -142,7 +142,7 @@ verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0); /* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */ -static inline int +static int leapyear (long_int year) { /* Don't add YEAR to TM_YEAR_BASE, as that might overflow. @@ -196,7 +196,7 @@ The result may overflow. It is the caller's responsibility to detect overflow. */ -static inline time_t +static time_t ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1, int year0, int yday0, int hour0, int min0, int sec0) { === modified file 'lib/sys_select.in.h' --- lib/sys_select.in.h 2012-06-22 21:26:37 +0000 +++ lib/sys_select.in.h 2012-08-19 23:31:24 +0000 @@ -130,7 +130,7 @@ /* Re-define FD_ISSET to avoid a WSA call while we are not using network sockets. */ -static inline int +static int rpl_fd_isset (SOCKET fd, fd_set * set) { u_int i; === modified file 'm4/gnulib-comp.m4' --- m4/gnulib-comp.m4 2012-08-02 04:46:10 +0000 +++ m4/gnulib-comp.m4 2012-08-19 23:31:24 +0000 @@ -136,135 +136,134 @@ m4_pushdef([gl_LIBSOURCES_DIR], []) gl_COMMON gl_source_base='lib' -gl_FUNC_ALLOCA -AC_CHECK_FUNCS_ONCE([readlinkat]) -gl_CLOCK_TIME -gl_MD5 -gl_SHA1 -gl_SHA256 -gl_SHA512 -AC_REQUIRE([gl_C99_STRTOLD]) -gl_FUNC_DUP2 -if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then - AC_LIBOBJ([dup2]) - gl_PREREQ_DUP2 -fi -gl_UNISTD_MODULE_INDICATOR([dup2]) -gl_ENVIRON -gl_UNISTD_MODULE_INDICATOR([environ]) -AC_REQUIRE([gl_EXTERN_INLINE]) -gl_FILEMODE -gl_GETLOADAVG -if test $HAVE_GETLOADAVG = 0; then - AC_LIBOBJ([getloadavg]) - gl_PREREQ_GETLOADAVG -fi -gl_STDLIB_MODULE_INDICATOR([getloadavg]) -gl_FUNC_GETOPT_GNU -if test $REPLACE_GETOPT = 1; then - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT - dnl Arrange for unistd.h to include getopt.h. - GNULIB_GL_UNISTD_H_GETOPT=1 -fi -AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) -gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) -gl_FUNC_GETOPT_POSIX -if test $REPLACE_GETOPT = 1; then - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT - dnl Arrange for unistd.h to include getopt.h. - GNULIB_GL_UNISTD_H_GETOPT=1 -fi -AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) -gl_GETTIME -gl_FUNC_GETTIMEOFDAY -if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then - AC_LIBOBJ([gettimeofday]) - gl_PREREQ_GETTIMEOFDAY -fi -gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) -AC_REQUIRE([AC_C_INLINE]) -gl_INTTYPES_INCOMPLETE -AC_REQUIRE([gl_LARGEFILE]) -gl_FUNC_LSTAT -if test $REPLACE_LSTAT = 1; then - AC_LIBOBJ([lstat]) - gl_PREREQ_LSTAT -fi -gl_SYS_STAT_MODULE_INDICATOR([lstat]) -gl_FUNC_MKTIME -if test $REPLACE_MKTIME = 1; then - AC_LIBOBJ([mktime]) - gl_PREREQ_MKTIME -fi -gl_TIME_MODULE_INDICATOR([mktime]) -gl_MULTIARCH -gl_FUNC_PSELECT -if test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1; then - AC_LIBOBJ([pselect]) -fi -gl_SYS_SELECT_MODULE_INDICATOR([pselect]) -gl_FUNC_PTHREAD_SIGMASK -if test $HAVE_PTHREAD_SIGMASK = 0 || test $REPLACE_PTHREAD_SIGMASK = 1; then - AC_LIBOBJ([pthread_sigmask]) - gl_PREREQ_PTHREAD_SIGMASK -fi -gl_SIGNAL_MODULE_INDICATOR([pthread_sigmask]) -gl_FUNC_READLINK -if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then - AC_LIBOBJ([readlink]) - gl_PREREQ_READLINK -fi -gl_UNISTD_MODULE_INDICATOR([readlink]) -gl_SIGNAL_H -gl_TYPE_SOCKLEN_T -gt_TYPE_SSIZE_T -gl_STAT_TIME -gl_STAT_BIRTHTIME -gl_STDALIGN_H -gl_STDARG_H -AM_STDBOOL_H -gl_STDDEF_H -gl_STDINT_H -gl_STDIO_H -gl_STDLIB_H -gl_FUNC_GNU_STRFTIME -gl_FUNC_STRTOIMAX -if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then - AC_LIBOBJ([strtoimax]) - gl_PREREQ_STRTOIMAX -fi -gl_INTTYPES_MODULE_INDICATOR([strtoimax]) -gl_FUNC_STRTOUMAX -if test $ac_cv_func_strtoumax = no; then - AC_LIBOBJ([strtoumax]) - gl_PREREQ_STRTOUMAX -fi -gl_INTTYPES_MODULE_INDICATOR([strtoumax]) -gl_FUNC_SYMLINK -if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then - AC_LIBOBJ([symlink]) -fi -gl_UNISTD_MODULE_INDICATOR([symlink]) -gl_HEADER_SYS_SELECT -AC_PROG_MKDIR_P -gl_HEADER_SYS_STAT_H -AC_PROG_MKDIR_P -gl_HEADER_SYS_TIME_H -AC_PROG_MKDIR_P -gl_HEADER_TIME_H -gl_TIME_R -if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then - AC_LIBOBJ([time_r]) - gl_PREREQ_TIME_R -fi -gl_TIME_MODULE_INDICATOR([time_r]) -gl_TIMESPEC -gl_UNISTD_H -gl_UTIMENS + gl_FUNC_ALLOCA + AC_CHECK_FUNCS_ONCE([readlinkat]) + gl_CLOCK_TIME + gl_MD5 + gl_SHA1 + gl_SHA256 + gl_SHA512 + AC_REQUIRE([gl_C99_STRTOLD]) + gl_FUNC_DUP2 + if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then + AC_LIBOBJ([dup2]) + gl_PREREQ_DUP2 + fi + gl_UNISTD_MODULE_INDICATOR([dup2]) + gl_ENVIRON + gl_UNISTD_MODULE_INDICATOR([environ]) + AC_REQUIRE([gl_EXTERN_INLINE]) + gl_FILEMODE + gl_GETLOADAVG + if test $HAVE_GETLOADAVG = 0; then + AC_LIBOBJ([getloadavg]) + gl_PREREQ_GETLOADAVG + fi + gl_STDLIB_MODULE_INDICATOR([getloadavg]) + gl_FUNC_GETOPT_GNU + if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + gl_PREREQ_GETOPT + dnl Arrange for unistd.h to include getopt.h. + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) + gl_FUNC_GETOPT_POSIX + if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + gl_PREREQ_GETOPT + dnl Arrange for unistd.h to include getopt.h. + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + gl_GETTIME + gl_FUNC_GETTIMEOFDAY + if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then + AC_LIBOBJ([gettimeofday]) + gl_PREREQ_GETTIMEOFDAY + fi + gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) + gl_INTTYPES_INCOMPLETE + AC_REQUIRE([gl_LARGEFILE]) + gl_FUNC_LSTAT + if test $REPLACE_LSTAT = 1; then + AC_LIBOBJ([lstat]) + gl_PREREQ_LSTAT + fi + gl_SYS_STAT_MODULE_INDICATOR([lstat]) + gl_FUNC_MKTIME + if test $REPLACE_MKTIME = 1; then + AC_LIBOBJ([mktime]) + gl_PREREQ_MKTIME + fi + gl_TIME_MODULE_INDICATOR([mktime]) + gl_MULTIARCH + gl_FUNC_PSELECT + if test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1; then + AC_LIBOBJ([pselect]) + fi + gl_SYS_SELECT_MODULE_INDICATOR([pselect]) + gl_FUNC_PTHREAD_SIGMASK + if test $HAVE_PTHREAD_SIGMASK = 0 || test $REPLACE_PTHREAD_SIGMASK = 1; then + AC_LIBOBJ([pthread_sigmask]) + gl_PREREQ_PTHREAD_SIGMASK + fi + gl_SIGNAL_MODULE_INDICATOR([pthread_sigmask]) + gl_FUNC_READLINK + if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then + AC_LIBOBJ([readlink]) + gl_PREREQ_READLINK + fi + gl_UNISTD_MODULE_INDICATOR([readlink]) + gl_SIGNAL_H + gl_TYPE_SOCKLEN_T + gt_TYPE_SSIZE_T + gl_STAT_TIME + gl_STAT_BIRTHTIME + gl_STDALIGN_H + gl_STDARG_H + AM_STDBOOL_H + gl_STDDEF_H + gl_STDINT_H + gl_STDIO_H + gl_STDLIB_H + gl_FUNC_GNU_STRFTIME + gl_FUNC_STRTOIMAX + if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then + AC_LIBOBJ([strtoimax]) + gl_PREREQ_STRTOIMAX + fi + gl_INTTYPES_MODULE_INDICATOR([strtoimax]) + gl_FUNC_STRTOUMAX + if test $ac_cv_func_strtoumax = no; then + AC_LIBOBJ([strtoumax]) + gl_PREREQ_STRTOUMAX + fi + gl_INTTYPES_MODULE_INDICATOR([strtoumax]) + gl_FUNC_SYMLINK + if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then + AC_LIBOBJ([symlink]) + fi + gl_UNISTD_MODULE_INDICATOR([symlink]) + gl_HEADER_SYS_SELECT + AC_PROG_MKDIR_P + gl_HEADER_SYS_STAT_H + AC_PROG_MKDIR_P + gl_HEADER_SYS_TIME_H + AC_PROG_MKDIR_P + gl_HEADER_TIME_H + gl_TIME_R + if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then + AC_LIBOBJ([time_r]) + gl_PREREQ_TIME_R + fi + gl_TIME_MODULE_INDICATOR([time_r]) + gl_TIMESPEC + gl_UNISTD_H + gl_UTIMENS gl_gnulib_enabled_dosname=false gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false gl_gnulib_enabled_pathmax=false @@ -281,27 +280,27 @@ func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36 () { if ! $gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36; then -AC_SUBST([LIBINTL]) -AC_SUBST([LTLIBINTL]) + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=true fi } func_gl_gnulib_m4code_pathmax () { if ! $gl_gnulib_enabled_pathmax; then -gl_PATHMAX + gl_PATHMAX gl_gnulib_enabled_pathmax=true fi } func_gl_gnulib_m4code_stat () { if ! $gl_gnulib_enabled_stat; then -gl_FUNC_STAT -if test $REPLACE_STAT = 1; then - AC_LIBOBJ([stat]) - gl_PREREQ_STAT -fi -gl_SYS_STAT_MODULE_INDICATOR([stat]) + gl_FUNC_STAT + if test $REPLACE_STAT = 1; then + AC_LIBOBJ([stat]) + gl_PREREQ_STAT + fi + gl_SYS_STAT_MODULE_INDICATOR([stat]) gl_gnulib_enabled_stat=true if test $REPLACE_STAT = 1; then func_gl_gnulib_m4code_dosname @@ -317,24 +316,24 @@ func_gl_gnulib_m4code_strtoll () { if ! $gl_gnulib_enabled_strtoll; then -gl_FUNC_STRTOLL -if test $HAVE_STRTOLL = 0; then - AC_LIBOBJ([strtoll]) - gl_PREREQ_STRTOLL -fi -gl_STDLIB_MODULE_INDICATOR([strtoll]) + gl_FUNC_STRTOLL + if test $HAVE_STRTOLL = 0; then + AC_LIBOBJ([strtoll]) + gl_PREREQ_STRTOLL + fi + gl_STDLIB_MODULE_INDICATOR([strtoll]) gl_gnulib_enabled_strtoll=true fi } func_gl_gnulib_m4code_strtoull () { if ! $gl_gnulib_enabled_strtoull; then -gl_FUNC_STRTOULL -if test $HAVE_STRTOULL = 0; then - AC_LIBOBJ([strtoull]) - gl_PREREQ_STRTOULL -fi -gl_STDLIB_MODULE_INDICATOR([strtoull]) + gl_FUNC_STRTOULL + if test $HAVE_STRTOULL = 0; then + AC_LIBOBJ([strtoull]) + gl_PREREQ_STRTOULL + fi + gl_STDLIB_MODULE_INDICATOR([strtoull]) gl_gnulib_enabled_strtoull=true fi } === modified file 'm4/mktime.m4' --- m4/mktime.m4 2012-06-22 17:20:00 +0000 +++ m4/mktime.m4 2012-08-19 23:31:24 +0000 @@ -1,4 +1,4 @@ -# serial 23 +# serial 24 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2012 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -247,7 +247,4 @@ ]) # Prerequisites of lib/mktime.c. -AC_DEFUN([gl_PREREQ_MKTIME], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_MKTIME], [:]) === modified file 'm4/stat-time.m4' --- m4/stat-time.m4 2012-06-22 21:26:37 +0000 +++ m4/stat-time.m4 2012-08-19 23:31:24 +0000 @@ -19,7 +19,6 @@ AC_DEFUN([gl_STAT_TIME], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CHECK_HEADERS_ONCE([sys/time.h]) @@ -70,7 +69,6 @@ # AC_DEFUN([gl_STAT_BIRTHTIME], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CHECK_HEADERS_ONCE([sys/time.h]) AC_CHECK_MEMBERS([struct stat.st_birthtimespec.tv_nsec], [], === modified file 'm4/timespec.m4' --- m4/timespec.m4 2012-06-22 21:26:37 +0000 +++ m4/timespec.m4 2012-08-19 23:31:24 +0000 @@ -1,4 +1,4 @@ -#serial 14 +#serial 15 # Copyright (C) 2000-2001, 2003-2007, 2009-2012 Free Software Foundation, Inc. @@ -8,8 +8,4 @@ dnl From Jim Meyering -AC_DEFUN([gl_TIMESPEC], -[ - dnl Prerequisites of lib/timespec.h. - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_TIMESPEC], [:]) ------------------------------------------------------------ revno: 109685 committer: Paul Eggert branch nick: trunk timestamp: Sun 2012-08-19 14:00:09 -0700 message: Rely on to declare 'environ', as gnulib does this if the system doesn't. * lib-src/emacsclient.c (environ): Remove decl. * src/callproc.c, src/editfns.c, src/process.c (environ) [!USE_CRT_DLL]: * src/emacs.c (environ) [DOUG_LEA_MALLOC]: * src/vm-limit.c (environ) [ORDINARY_LINK]: Remove decl. * src/vm-limit.c: Include , for 'environ'. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-08-17 01:53:29 +0000 +++ lib-src/ChangeLog 2012-08-19 21:00:09 +0000 @@ -1,3 +1,8 @@ +2012-08-19 Paul Eggert + + Rely on to declare 'environ'. + * emacsclient.c (environ): Remove decl. + 2012-08-17 Juanma Barranquero * makefile.w32-in ($(BLD)/regex.$(O)): Update dependencies. === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2012-08-10 18:23:45 +0000 +++ lib-src/emacsclient.c 2012-08-19 21:00:09 +0000 @@ -1584,11 +1584,6 @@ /* Send over our environment and current directory. */ if (!current_frame) { -#ifndef WINDOWSNT - /* This is defined in stdlib.h on MS-Windows. It's defined in - unistd.h on some POSIX hosts, but not all (Bug#10155). */ - extern char **environ; -#endif int i; for (i = 0; environ[i]; i++) { === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-19 20:02:24 +0000 +++ src/ChangeLog 2012-08-19 21:00:09 +0000 @@ -1,5 +1,12 @@ 2012-08-19 Paul Eggert + Rely on to declare 'environ', + as gnulib does this if the system doesn't. + * callproc.c, editfns.c, process.c (environ) [!USE_CRT_DLL]: + * emacs.c (environ) [DOUG_LEA_MALLOC]: + * vm-limit.c (environ) [ORDINARY_LINK]: Remove decl. + * vm-limit.c: Include , for 'environ'. + * unexaix.c, unexcoff.c: Include "mem-limits.h". (start_of_data): Remove decl; mem-limits.h provides it. === modified file 'src/callproc.c' --- src/callproc.c 2012-08-04 14:17:10 +0000 +++ src/callproc.c 2012-08-19 21:00:09 +0000 @@ -65,10 +65,6 @@ #include "nsterm.h" #endif -#ifndef USE_CRT_DLL -extern char **environ; -#endif - #ifdef HAVE_SETPGID #if !defined (USG) #undef setpgrp === modified file 'src/editfns.c' --- src/editfns.c 2012-08-18 06:06:39 +0000 +++ src/editfns.c 2012-08-19 21:00:09 +0000 @@ -58,10 +58,6 @@ #include "window.h" #include "blockinput.h" -#ifndef USE_CRT_DLL -extern char **environ; -#endif - #define TM_YEAR_BASE 1900 #ifdef WINDOWSNT === modified file 'src/emacs.c' --- src/emacs.c 2012-08-05 21:44:21 +0000 +++ src/emacs.c 2012-08-19 21:00:09 +0000 @@ -642,10 +642,6 @@ static void malloc_initialize_hook (void) { -#ifndef USE_CRT_DLL - extern char **environ; -#endif - if (initialized) { if (!malloc_using_checking) === modified file 'src/process.c' --- src/process.c 2012-08-18 06:06:39 +0000 +++ src/process.c 2012-08-19 21:00:09 +0000 @@ -1623,9 +1623,6 @@ /* Use volatile to protect variables from being clobbered by longjmp. */ volatile int forkin, forkout; volatile int pty_flag = 0; -#ifndef USE_CRT_DLL - extern char **environ; -#endif inchannel = outchannel = -1; === modified file 'src/vm-limit.c' --- src/vm-limit.c 2012-05-21 15:36:54 +0000 +++ src/vm-limit.c 2012-08-19 21:00:09 +0000 @@ -18,6 +18,7 @@ #include #include +#include /* for 'environ', on AIX */ #include "lisp.h" #include "mem-limits.h" @@ -268,7 +269,6 @@ * is known to live at or near the start of the system crt0.c, and * we don't sweat the handful of bytes that might lose. */ - extern char **environ; return ((POINTER) &environ); #else extern int data_start; ------------------------------------------------------------ revno: 109684 committer: Paul Eggert branch nick: trunk timestamp: Sun 2012-08-19 13:02:24 -0700 message: * unexaix.c, unexcoff.c: Include "mem-limits.h". (start_of_data): Remove decl; mem-limits.h provides it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-19 19:22:41 +0000 +++ src/ChangeLog 2012-08-19 20:02:24 +0000 @@ -1,5 +1,8 @@ 2012-08-19 Paul Eggert + * unexaix.c, unexcoff.c: Include "mem-limits.h". + (start_of_data): Remove decl; mem-limits.h provides it. + * xdisp.c (handle_invisible_prop): Make it a bit faster and avoid a gcc -Wmaybe-uninitialized diagnostic. === modified file 'src/unexaix.c' --- src/unexaix.c 2012-05-14 15:11:10 +0000 +++ src/unexaix.c 2012-08-19 20:02:24 +0000 @@ -56,8 +56,9 @@ #include #include +#include "mem-limits.h" + char *start_of_text (void); /* Start of text */ -extern char *start_of_data (void); /* Start of initialized data */ extern int _data; extern int _text; === modified file 'src/unexcoff.c' --- src/unexcoff.c 2012-01-19 07:21:25 +0000 +++ src/unexcoff.c 2012-08-19 20:02:24 +0000 @@ -98,7 +98,7 @@ #include -extern char *start_of_data (void); /* Start of initialized data */ +#include "mem-limits.h" static long block_copy_start; /* Old executable start point */ static struct filehdr f_hdr; /* File header */ ------------------------------------------------------------ revno: 109683 committer: Paul Eggert branch nick: trunk timestamp: Sun 2012-08-19 12:22:41 -0700 message: * xdisp.c (handle_invisible_prop): Make it a bit faster and avoid a gcc -Wmaybe-uninitialized diagnostic. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-19 16:19:05 +0000 +++ src/ChangeLog 2012-08-19 19:22:41 +0000 @@ -1,3 +1,8 @@ +2012-08-19 Paul Eggert + + * xdisp.c (handle_invisible_prop): Make it a bit faster + and avoid a gcc -Wmaybe-uninitialized diagnostic. + 2012-08-19 Chong Yidong * xdisp.c (handle_invisible_prop): Fix ellipses at overlay string === modified file 'src/xdisp.c' --- src/xdisp.c 2012-08-19 16:19:05 +0000 +++ src/xdisp.c 2012-08-19 19:22:41 +0000 @@ -4094,7 +4094,7 @@ /* Get the position at which the next visible text can be found in IT->string, if any. */ - len = SCHARS (it->string); + endpos = len = SCHARS (it->string); XSETINT (limit, len); do { @@ -4109,12 +4109,12 @@ display_ellipsis_p = 1; } } - while (invis_p && INTEGERP (end_charpos) && endpos < len); + while (invis_p && endpos < len); if (display_ellipsis_p) it->ellipsis_p = 1; - if (INTEGERP (end_charpos) && endpos < len) + if (endpos < len) { /* Text at END_CHARPOS is visible. Move IT there. */ struct text_pos old; ------------------------------------------------------------ revno: 109682 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-08-19 11:41:35 -0700 message: Fix previous rmail-output-read-file-name change * lisp/mail/rmailout.el (rmail-output-read-file-name): Fix previous change (when the alist is nil or does not match). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-19 06:37:15 +0000 +++ lisp/ChangeLog 2012-08-19 18:41:35 +0000 @@ -1,3 +1,8 @@ +2012-08-19 Glenn Morris + + * mail/rmailout.el (rmail-output-read-file-name): + Fix previous change (when the alist is nil or does not match). + 2012-08-19 Chong Yidong * xml.el (xml-escape-string): Don't refer to xml-entity-alist === modified file 'lisp/mail/rmailout.el' --- lisp/mail/rmailout.el 2012-08-17 20:38:47 +0000 +++ lisp/mail/rmailout.el 2012-08-19 18:41:35 +0000 @@ -61,27 +61,30 @@ Set `rmail-default-file' to this name as well as returning it. This uses `rmail-output-file-alist'." (let* ((default-file - (when rmail-output-file-alist - (or rmail-buffer (error "There is no Rmail buffer")) - (save-current-buffer - (set-buffer rmail-buffer) - (let ((beg (rmail-msgbeg rmail-current-message)) - (end (rmail-msgend rmail-current-message))) - (if (rmail-buffers-swapped-p) (set-buffer rmail-view-buffer)) - (save-excursion - (save-restriction - (widen) - (narrow-to-region beg end) - (let ((tail rmail-output-file-alist) - answer) - ;; Suggest a file based on a pattern match. - (while (and tail (not answer)) - (goto-char (point-min)) - (if (re-search-forward (caar tail) nil t) - (setq answer (eval (cdar tail)))) - (setq tail (cdr tail))) - ;; If no suggestion, use same file as last time. - (or answer rmail-default-file)))))))) + (or + (when rmail-output-file-alist + (or rmail-buffer (error "There is no Rmail buffer")) + (save-current-buffer + (set-buffer rmail-buffer) + (let ((beg (rmail-msgbeg rmail-current-message)) + (end (rmail-msgend rmail-current-message))) + (if (rmail-buffers-swapped-p) (set-buffer rmail-view-buffer)) + (save-excursion + (save-restriction + (widen) + (narrow-to-region beg end) + (let ((tail rmail-output-file-alist) + answer) + ;; Suggest a file based on a pattern match. + (while (and tail (not answer)) + (goto-char (point-min)) + (if (re-search-forward (caar tail) nil t) + ;; FIXME trap and report any errors. + (setq answer (eval (cdar tail)))) + (setq tail (cdr tail))) + answer)))))) + ;; If no suggestion, use same file as last time. + rmail-default-file)) (read-file (expand-file-name (read-file-name ------------------------------------------------------------ revno: 109681 fixes bug: http://debbugs.gnu.org/3874 committer: Chong Yidong branch nick: trunk timestamp: Mon 2012-08-20 00:19:05 +0800 message: * src/xdisp.c (handle_invisible_prop): Fix ellipses at overlay string ends. * test/redisplay-testsuite.el (test-redisplay): Use switch-to-buffer. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-19 10:50:03 +0000 +++ src/ChangeLog 2012-08-19 16:19:05 +0000 @@ -1,3 +1,8 @@ +2012-08-19 Chong Yidong + + * xdisp.c (handle_invisible_prop): Fix ellipses at overlay string + ends (Bug#3874). + 2012-08-19 Andreas Schwab * .gdbinit: Use call instead of set when calling a function in the === modified file 'src/xdisp.c' --- src/xdisp.c 2012-08-18 07:23:30 +0000 +++ src/xdisp.c 2012-08-19 16:19:05 +0000 @@ -4088,35 +4088,33 @@ /* Record whether we have to display an ellipsis for the invisible text. */ int display_ellipsis_p = (invis_p == 2); - ptrdiff_t endpos; + ptrdiff_t len, endpos; handled = HANDLED_RECOMPUTE_PROPS; /* Get the position at which the next visible text can be found in IT->string, if any. */ - XSETINT (limit, SCHARS (it->string)); + len = SCHARS (it->string); + XSETINT (limit, len); do { end_charpos = Fnext_single_property_change (charpos, Qinvisible, it->string, limit); - if (!NILP (end_charpos)) + if (INTEGERP (end_charpos)) { + endpos = XFASTINT (end_charpos); prop = Fget_text_property (end_charpos, Qinvisible, it->string); invis_p = TEXT_PROP_MEANS_INVISIBLE (prop); if (invis_p == 2) display_ellipsis_p = 1; } } - while (!NILP (end_charpos) && invis_p); + while (invis_p && INTEGERP (end_charpos) && endpos < len); if (display_ellipsis_p) - { - it->ellipsis_p = 1; - handled = HANDLED_RETURN; - } + it->ellipsis_p = 1; - if (INTEGERP (end_charpos) - && (endpos = XFASTINT (end_charpos)) < XFASTINT (limit)) + if (INTEGERP (end_charpos) && endpos < len) { /* Text at END_CHARPOS is visible. Move IT there. */ struct text_pos old; @@ -4154,7 +4152,8 @@ /* The rest of the string is invisible. If this is an overlay string, proceed with the next overlay string or whatever comes and return a character from there. */ - if (it->current.overlay_string_index >= 0) + if (it->current.overlay_string_index >= 0 + && !display_ellipsis_p) { next_overlay_string (it); /* Don't check for overlay strings when we just === modified file 'test/ChangeLog' --- test/ChangeLog 2012-08-18 07:23:30 +0000 +++ test/ChangeLog 2012-08-19 16:19:05 +0000 @@ -1,3 +1,7 @@ +2012-08-19 Chong Yidong + + * redisplay-testsuite.el (test-redisplay): Use switch-to-buffer. + 2012-08-18 Chong Yidong * redisplay-testsuite.el (test-redisplay-4): New test (Bug#3874). === modified file 'test/redisplay-testsuite.el' --- test/redisplay-testsuite.el 2012-08-18 07:23:30 +0000 +++ test/redisplay-testsuite.el 2012-08-19 16:19:05 +0000 @@ -260,7 +260,7 @@ (let ((buf (get-buffer "*Redisplay Test*"))) (if buf (kill-buffer buf)) - (pop-to-buffer (get-buffer-create "*Redisplay Test*")) + (switch-to-buffer (get-buffer-create "*Redisplay Test*")) (erase-buffer) (setq buffer-invisibility-spec '(test-redisplay--simple-invis ------------------------------------------------------------ revno: 109680 committer: Andreas Schwab branch nick: emacs timestamp: Sun 2012-08-19 12:50:03 +0200 message: * .gdbinit: Use call instead of set when calling a function in the inferior. diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2012-08-07 16:53:38 +0000 +++ src/.gdbinit 2012-08-19 10:50:03 +0000 @@ -89,7 +89,7 @@ set $tmp = $arg0 set $output_debug = print_output_debug_flag set print_output_debug_flag = 0 - set safe_debug_print ($tmp) + call safe_debug_print ($tmp) set print_output_debug_flag = $output_debug end document pp @@ -102,7 +102,7 @@ set $tmp = "$arg0" set $output_debug = print_output_debug_flag set print_output_debug_flag = 0 - set safe_debug_print (find_symbol_value (intern ($tmp))) + call safe_debug_print (find_symbol_value (intern ($tmp))) set print_output_debug_flag = $output_debug end document pv @@ -1162,7 +1162,7 @@ define xwhichsymbols set $output_debug = print_output_debug_flag set print_output_debug_flag = 0 - set safe_debug_print (which_symbols ($arg0, $arg1)) + call safe_debug_print (which_symbols ($arg0, $arg1)) set print_output_debug_flag = $output_debug end document xwhichsymbols === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-19 08:40:12 +0000 +++ src/ChangeLog 2012-08-19 10:50:03 +0000 @@ -1,5 +1,8 @@ 2012-08-19 Andreas Schwab + * .gdbinit: Use call instead of set when calling a function in the + inferior. + * data.c (set_internal): Don't use set_blv_found. (Fkill_local_variable): Likewise. ------------------------------------------------------------ revno: 109679 committer: Andreas Schwab branch nick: emacs timestamp: Sun 2012-08-19 10:40:12 +0200 message: * data.c (set_internal): Don't use set_blv_found. (Fkill_local_variable): Likewise. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-19 00:53:29 +0000 +++ src/ChangeLog 2012-08-19 08:40:12 +0000 @@ -1,3 +1,8 @@ +2012-08-19 Andreas Schwab + + * data.c (set_internal): Don't use set_blv_found. + (Fkill_local_variable): Likewise. + 2012-08-18 Alp Aker * nsfont.m (ns_ascii_average_width): Ensure the string === modified file 'src/data.c' --- src/data.c 2012-08-18 06:06:39 +0000 +++ src/data.c 2012-08-19 08:40:12 +0000 @@ -1184,7 +1184,7 @@ ? XFRAME (where)->param_alist : BVAR (XBUFFER (where), local_var_alist))); set_blv_where (blv, where); - set_blv_found (blv, 1); + blv->found = 1; if (NILP (tem1)) { @@ -1199,7 +1199,7 @@ if (bindflag || !blv->local_if_set || let_shadows_buffer_binding_p (sym)) { - set_blv_found (blv, 0); + blv->found = 0; tem1 = blv->defcell; } /* If it's a local_if_set, being set not bound, @@ -1735,7 +1735,7 @@ if (EQ (buf, blv->where)) { set_blv_where (blv, Qnil); - set_blv_found (blv, 0); + blv->found = 0; find_symbol_value (variable); } } ------------------------------------------------------------ revno: 109678 fixes bug: http://debbugs.gnu.org/12228 committer: Chong Yidong branch nick: trunk timestamp: Sun 2012-08-19 14:37:15 +0800 message: * xml.el (xml-escape-string): Don't refer to xml-entity-alist. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-18 05:11:38 +0000 +++ lisp/ChangeLog 2012-08-19 06:37:15 +0000 @@ -1,3 +1,8 @@ +2012-08-19 Chong Yidong + + * xml.el (xml-escape-string): Don't refer to xml-entity-alist + (Bug#12228). + 2012-08-18 Chong Yidong * simple.el (yank-handled-properties): New defcustom. === modified file 'lisp/xml.el' --- lisp/xml.el 2012-07-28 09:19:53 +0000 +++ lisp/xml.el 2012-08-19 06:37:15 +0000 @@ -1011,13 +1011,25 @@ (defalias 'xml-print 'xml-debug-print) (defun xml-escape-string (string) - "Return STRING with entity substitutions made from `xml-entity-alist'." - (mapconcat (lambda (byte) - (let ((char (char-to-string byte))) - (if (rassoc char xml-entity-alist) - (concat "&" (car (rassoc char xml-entity-alist)) ";") - char))) - string "")) + "Convert STRING into a string containing valid XML character data. +Replace occurrences of &<>'\" in STRING with their default XML +entity references (e.g. replace each & with &). + +XML character data must not contain & or < characters, nor the > +character under some circumstances. The XML spec does not impose +restriction on \" or ', but we just substitute for these too +\(as is permitted by the spec)." + (with-temp-buffer + (insert string) + (dolist (substitution '(("&" . "&") + ("<" . "<") + (">" . ">") + ("'" . "'") + ("\"" . """))) + (goto-char (point-min)) + (while (search-forward (car substitution) nil t) + (replace-match (cdr substitution) t t nil))) + (buffer-string))) (defun xml-debug-print-internal (xml indent-string) "Outputs the XML tree in the current buffer.