From: Stefan Monnier Date: Thu, 18 Oct 2012 12:56:10 +0000 (-0400) Subject: * lisp/emacs-lisp/gv.el (cond): Same fix as before for `if'. X-Git-Tag: emacs-24.2.90~225 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=90eacf9920c2d9dc4edffdefe7e7a2a781493cc2;p=emacs.git * lisp/emacs-lisp/gv.el (cond): Same fix as before for `if'. * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well. --- diff --git a/ChangeLog b/ChangeLog index b8c7adb8708..81eddade0a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-10-18 Stefan Monnier + + * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well. + 2012-10-15 Glenn Morris * Makefile.in (install-man, install-etc): @@ -10,8 +14,8 @@ 2012-10-08 Daniel Colascione - * configure.ac: Add --with-w32 as a window system option. Limit - it to Cygwin for now. Integrate w32 into the refactored window + * configure.ac: Add --with-w32 as a window system option. + Limit it to Cygwin for now. Integrate w32 into the refactored window system configuration and set TERM_HEADER to w32term.h when w32 is configured. @@ -796,8 +800,8 @@ 2012-06-26 Eli Zaretskii - * lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD. This - replaces separate dependency for each object file, which required + * lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD. + This replaces separate dependency for each object file, which required the same object file to be mentioned twice, causing failures in parallel builds. @@ -995,8 +999,8 @@ The build procedure now creates and for older hosts that lack a working or whose - does not define pid_t, size_t, ssize_t, mode_t. New - symbols such as WINDOWS_64_BIT_OFF_T may require attention in the + does not define pid_t, size_t, ssize_t, mode_t. + New symbols such as WINDOWS_64_BIT_OFF_T may require attention in the msdos and nt builds. Here is a precis of gnulib changes that seem relevant; please see @@ -2291,8 +2295,8 @@ * .bzrignore: Ignore new lib/*.in-h files. - * config.bat: Rename stdint.in.h and sys_stat.in.h. Call - depfiles.bat even if lib/deps already exist. + * config.bat: Rename stdint.in.h and sys_stat.in.h. + Call depfiles.bat even if lib/deps already exist. 2011-02-25 Paul Eggert @@ -2319,7 +2323,7 @@ 2011-02-21 Christoph Scholtes - * lib/makefile.w32-in ($(BLD)/md5.$(O)): Added dependency on + * lib/makefile.w32-in ($(BLD)/md5.$(O)): Add dependency on $(EMACS_ROOT)/nt/inc/stdint.h. 2011-02-21 Eli Zaretskii @@ -2420,7 +2424,7 @@ 2011-02-13 Bruno Haible Consistent macro naming for macros that use GCC __attribute__. - * lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Renamed from + * lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Rename from ATTRIBUTE_DEPRECATED. 2011-02-12 Bruno Haible @@ -2481,7 +2485,7 @@ 2011-02-05 Paul Eggert sync from gnulib to remove HAVE_STDBOOL_H - * m4/stdbool.m4 (AC_CHECK_HEADER_STDBOOL): Renamed from + * m4/stdbool.m4 (AC_CHECK_HEADER_STDBOOL): Rename from AC_HEADER_STDBOOL. All uses changed. Do not define HAVE_STDBOOL_H, as gnulib does not need this. This change is imported from the latest Autoconf git. It was motivated by Emacs, @@ -2566,8 +2570,8 @@ * lib/mktime.c (isdst_differ): New function. (__mktime_internal): Use it systematically for all isdst comparisons. This completes the fix for libc BZ #6723, and removes the need for - normalizing tm_isdst. See - + normalizing tm_isdst. + See (not_equal_tm) [DEBUG]: Use isdst_differ here, too. mktime: fix some integer overflow issues and sidestep the rest @@ -2641,7 +2645,7 @@ 2011-01-28 Paul Eggert improve fix for MS-DOS file name clash - * Makefile.in (DOS_gnulib_comp.m4): Renamed from DOS-gnulib-comp.m4, + * Makefile.in (DOS_gnulib_comp.m4): Rename from DOS-gnulib-comp.m4, for portability to POSIX make. Reported by Bruno Haible. (sync-from-gnulib): Copy gl-comp.m4 (if present) back to gnulib-comp.m4 before running gnulib-tool, to prevent old gnulib @@ -2932,8 +2936,8 @@ 2010-12-04 Andreas Schwab * configure.in: Remove reference to removed machine description - files and allow $machine and $machfile to be empty. Substitute - M_FILE/S_FILE instead of machfile/opsysfile. + files and allow $machine and $machfile to be empty. + Substitute M_FILE/S_FILE instead of machfile/opsysfile. 2010-12-03 Glenn Morris @@ -2966,8 +2970,8 @@ 2010-10-31 Ken Brown - * configure.in (checking whether localtime caches TZ): Use - unsetenv instead of modifying environment directly. + * configure.in (checking whether localtime caches TZ): + Use unsetenv instead of modifying environment directly. 2010-10-25 Andreas Schwab @@ -3000,8 +3004,8 @@ 2010-10-12 Dan Nicolaescu - * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove - trailing / from directory names. + * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): + Remove trailing / from directory names. 2010-10-12 Glenn Morris @@ -4212,8 +4216,8 @@ 2008-08-21 Christian Faulhammer (tiny change) - * configure.in (GNUSTEP_SYSTEM_HEADERS): Define - GNUSTEP_SYSTEM_HEADERS and GNUSTEP_SYSTEM_LIBRARIES. + * configure.in (GNUSTEP_SYSTEM_HEADERS): + Define GNUSTEP_SYSTEM_HEADERS and GNUSTEP_SYSTEM_LIBRARIES. * configure: Regenerate. @@ -4254,8 +4258,8 @@ 2008-08-06 Adrian Robert * configure.in (NS_HAVE_INTEGER): Rename to NS_HAVE_NSINTEGER. - (C_SWITCH_X_SYSTEM): Drop -MMD -MP under NS_IMPL_GNUstep. Don't - bother undef'ing since won't have desired effect. + (C_SWITCH_X_SYSTEM): Drop -MMD -MP under NS_IMPL_GNUstep. + Don't bother undef'ing since won't have desired effect. 2008-08-06 Andreas Schwab @@ -5152,8 +5156,8 @@ 2007-03-19 Deanna Phillips (tiny change) * configure.in (arm-*-openbsd*, hppa-*-openbsd*) - (m88k-*-openbsd*, mips64-*-openbsd*, sh-*-openbsd*): Added. - (ns32k-*-openbsd*, ns32k-*-openbsd*): Deleted. + (m88k-*-openbsd*, mips64-*-openbsd*, sh-*-openbsd*): Add. + (ns32k-*-openbsd*, ns32k-*-openbsd*): Delete. 2007-03-19 Chong Yidong @@ -5483,7 +5487,7 @@ * configure.in: Use GZIP_PROG instead of GZIP. - * Makefile.in (GZIP_PROG): Renamed from GZIP. + * Makefile.in (GZIP_PROG): Rename from GZIP. (install-arch-indep): Adjust. 2005-11-01 Andreas Schwab @@ -5596,8 +5600,8 @@ 2005-05-13 YAMAMOTO Mitsuharu * configure.in: Don't check HAVE_CARBON if HAVE_X11 is set to yes. - Check HAVE_CARBON before USE_TOOLKIT_SCROLL_BARS. Define - USE_TOOLKIT_SCROLL_BARS by default if HAVE_CARBON is set to yes. + Check HAVE_CARBON before USE_TOOLKIT_SCROLL_BARS. + Define USE_TOOLKIT_SCROLL_BARS by default if HAVE_CARBON is set to yes. 2005-05-07 Jérôme Marant @@ -6691,8 +6695,8 @@ * Makefile.in (uninstall): Ignore exit code of `rm'. - * Makefile.in (uninstall): Remove more info files. Remove - ${libexecdir}/emacs/${version}. Remove ${archlibdir}/fns-*. + * Makefile.in (uninstall): Remove more info files. + Remove ${libexecdir}/emacs/${version}. Remove ${archlibdir}/fns-*. 2001-01-31 Gerd Moellmann @@ -6700,7 +6704,7 @@ 2001-01-28 Gerd Moellmann - * Makefile.in (extraclean): Added -f to -rm config-tmp-* to keep + * Makefile.in (extraclean): Add -f to -rm config-tmp-* to keep it quiet. 2001-01-24 Colin Walters @@ -6895,7 +6899,7 @@ (NON-TIT-CNS, JAPANESE, KOREAN, THAI, VIETNAMESE, LAO, INDIAN) (TIBETAN, LATIN, SLAVIC, GREEK, RUSSIAN, MISC): Rename all .el files to .elc. - (${TIT}): Adjusted for the above change. + (${TIT}): Adjust for the above change. (clean mostlyclean): Likewise. (.el.elc): New target. @@ -6982,7 +6986,7 @@ 2000-07-26 Dave Love - * configure.in (AC_SYS_LARGEFILE): Moved earlier. + * configure.in (AC_SYS_LARGEFILE): Move earlier. 2000-07-24 Dave Love @@ -7154,8 +7158,8 @@ * Makefile.in (bootstrap-lisp-1, bootstrap-lisp, bootstrap-src): New targets. - (bootstrap): Rewritten in terms of the new targets above. Make - info files, too. + (bootstrap): Rewritten in terms of the new targets above. + Make info files, too. 2000-03-12 Gerd Moellmann @@ -7234,8 +7238,8 @@ 2000-01-03 Andreas Schwab - * Makefile.in (install-arch-indep): Install autotype*. Run - install-info on autotype and emacs-faq.info. + * Makefile.in (install-arch-indep): Install autotype*. + Run install-info on autotype and emacs-faq.info. 1999-12-04 Dave Love @@ -7311,7 +7315,7 @@ 1999-09-07 Gerd Moellmann - * configure.in (--with-sound): Removed. + * configure.in (--with-sound): Remove. 1999-08-30 Gerd Moellmann @@ -7408,7 +7412,7 @@ * configure.in: Use epaths.h and epaths-force instead of paths... - * Makefile.in (epaths-force): Renamed from paths-force; + * Makefile.in (epaths-force): Rename from paths-force; operate on epaths.in and produce epaths.h. 1999-02-24 Richard Stallman @@ -7753,8 +7757,8 @@ 1997-08-24 NIIBE Yutaka - * configure.in (x_default_search_path): Corrected - '${x_library}' to '${x_library}/X11'. + * configure.in (x_default_search_path): + Corrected '${x_library}' to '${x_library}/X11'. 1997-08-22 Richard Stallman @@ -8454,7 +8458,7 @@ 1995-12-24 Richard Stallman * configure.in: Determine HAVE_X11R6. - (HAVE_MENUS): Renamed from HAVE_X_MENU. + (HAVE_MENUS): Rename from HAVE_X_MENU. 1995-12-21 Richard Stallman @@ -8647,8 +8651,8 @@ 1995-07-06 David J. MacKenzie - * configure.in: Put back archlibdir initialization. Require - autoconf 2.4.1 or later. + * configure.in: Put back archlibdir initialization. + Require autoconf 2.4.1 or later. 1995-07-01 Richard Stallman @@ -8776,7 +8780,7 @@ * make-dist: Put src/makefile.nt in dist. * configure.in (i[345]86-*-bsdi2*): New configuration. - (vax-dec-bsd386*): Deleted. + (vax-dec-bsd386*): Delete. 1995-05-06 David J. MacKenzie @@ -8786,7 +8790,7 @@ 1995-05-03 Richard Stallman - * configure.in (m68*-apollo-*): Renamed from m68*-apollo*. + * configure.in (m68*-apollo-*): Rename from m68*-apollo*. Use bsd4-3. Don't set NON_GNU_CPP. * make-dist: Don't copy in src/s/*.inp. Don't copy nt/src. @@ -8863,7 +8867,7 @@ 1995-02-07 Richard Stallman - * Makefile.in (maintainer-clean): Renamed from realclean. + * Makefile.in (maintainer-clean): Rename from realclean. 1995-02-02 David J. MacKenzie @@ -9032,8 +9036,8 @@ * Makefile.in: Use libexecdir and sharedstatedir as appropriate. - * configure.in (libexecdir): Renamed from libdir. New default. - (sharedstatedir): Renamed from statedir. New default. + * configure.in (libexecdir): Rename from libdir. New default. + (sharedstatedir): Rename from statedir. New default. (datadir): New default. * make-dist: Don't distribute subdirs.el. @@ -9583,7 +9587,7 @@ 1994-02-14 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu) - * configure.in (rs6000-bull-bosx*): Added support for BULL dpx20. + * configure.in (rs6000-bull-bosx*): Add support for BULL dpx20. 1994-02-11 Karl Heuer (kwzh@mole.gnu.ai.mit.edu) @@ -9736,7 +9740,7 @@ * Makefile.in (mkdir): Make only the lockdir writable. - * configure.in (i860-*-sysv4): Renamed from i860-*-sysvr4. + * configure.in (i860-*-sysv4): Rename from i860-*-sysvr4. 1993-12-11 Richard Stallman (rms@srarc2) @@ -9850,8 +9854,8 @@ 1993-09-28 Brian J. Fox (bfox@cubit) * configure.in: Don't copy ${srcdir}/src/Makefile.in; that file - doesn't exist. Just copy src/Makefile.in instead. Touch - all of the Makefiles after editing config.status. + doesn't exist. Just copy src/Makefile.in instead. + Touch all of the Makefiles after editing config.status. * INSTALL: Update documentation to match new configuration mechanism. @@ -9932,8 +9936,8 @@ 1993-09-10 Roland McGrath (roland@churchy.gnu.ai.mit.edu) - * configure.in: Remove check for $srcdir being configured. This - pretty much works now. + * configure.in: Remove check for $srcdir being configured. + This pretty much works now. Grok {m68*-hp,i[34]86-*}-netbsd* and set opsys=netbsd. Check for XFree86 (/usr/X386/include) independent of whether -lXbsd exists. @@ -9974,7 +9978,7 @@ 1993-08-10 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * configure.in (m88k-tektronix-sysv3*): Added the missing *. + * configure.in (m88k-tektronix-sysv3*): Add the missing *. Use tekxd88, not tekXD88. 1993-08-10 Roland McGrath (roland@churchy.gnu.ai.mit.edu) @@ -10349,8 +10353,8 @@ * INSTALL: Mention its usage. * configure.in (hppa-hp-hpux): Use uname -r instead of uname -m; - the former gives you the operating system rev directly. Use - s/hpux.h if we don't recognize what we got. + the former gives you the operating system rev directly. + Use s/hpux.h if we don't recognize what we got. * Makefile.in (do-install): Don't remove a destination directory if it's the same as the source. If ${srcdir}/info == ${infodir}, @@ -10397,8 +10401,8 @@ * Makefile.in (install): Split this into `install' and `do-install', to give people more control over exactly what gets done. - (do-install): New target, containing the guts of `install'. Don't - remove and recreate the directories inside the copying loop - do + (do-install): New target, containing the guts of `install'. + Don't remove and recreate the directories inside the copying loop - do it all before the copying loop. Pass more flags to the lib-src make. (mkdir): Create ${infodir}, ${mandir}, and ${sitelispdir} here, to @@ -10455,7 +10459,7 @@ * configure.in: Make the first line of the configure script be "#!/bin/sh". Leaving the first line blank didn't work. - * configure.in (long_usage): Removed; made short_usage describe + * configure.in (long_usage): Remove; made short_usage describe the options briefly. * configure.in: Implement the --prefix option. @@ -10527,11 +10531,11 @@ * PROBLEMS: Some updates from David J. Mackenzie. More changes from David J. Mackenzie. - * Makefile.in (install.sysv, install.xenix, install.aix): Targets - removed; autoconf and config.h should specify all these + * Makefile.in (install.sysv, install.xenix, install.aix): + Targets removed; autoconf and config.h should specify all these differences. (buildlisppath): Make this path depend on ${srcdir}. - (INSTALLFLAGS): Removed. + (INSTALLFLAGS): Remove. (INSTALL): Include the -c flag. (install): Change the way we invoke install accordingly. @@ -10574,14 +10578,14 @@ 1993-05-09 Jim Blandy (jimb@totoro.cs.oberlin.edu) - * Makefile.in (DEFS): Deleted; since we're using AC_CONFIG_HEADER, + * Makefile.in (DEFS): Delete; since we're using AC_CONFIG_HEADER, this is always just -DHAVE_CONFIG_H. The GNU coding standards specify that CFLAGS should be left for users to set. * Makefile.in (CFLAGS): Let configure determine the default value - for this. Don't - have it default to DEFS. + for this. + Don't have it default to DEFS. (${SUBDIR}): Pass CFLAGS down to submakes, not DEFS. (lib-src/Makefile, src/Makefile): Edit the default value for CFLAGS into these files, not DEFS. @@ -10707,17 +10711,17 @@ Use autoconf to produce Makefile and src/config.h. Remove the Makefile-style comment that autoconf places at the top of src/config.h. - (config_h_opts): Removed - no longer necessary. - * Makefile.in (configname): Renamed to configuration. - (CONFIG_CFLAGS): Renamed to DEFS. - (CC, DEFS, C_SWITCH_SYSTEM, version, configuration): Adjusted to + (config_h_opts): Remove - no longer necessary. + * Makefile.in (configname): Rename to configuration. + (CONFIG_CFLAGS): Rename to DEFS. + (CC, DEFS, C_SWITCH_SYSTEM, version, configuration): Adjust to get values via autoload @cookies@. (libsrc_libs): Get this from autoconf. We used to do nothing about this. (${SUBDIR}): Pass DEFS to submakes instead of CONFIG_CFLAGS. - * Makefile.in (src/paths.h, lib-src/Makefile, src/Makefile): Don't - echo the move-if-change command. + * Makefile.in (src/paths.h, lib-src/Makefile, src/Makefile): + Don't echo the move-if-change command. 1993-04-08 Jim Blandy (jimb@churchy.gnu.ai.mit.edu) @@ -10772,8 +10776,8 @@ * configure: Properly handle extracting values of LIBS_MACHINE and LIBS_SYSTEM that contain spaces. - * configure: Add `--x-includes' and `--x-libraries' options. I - think these are dopey, but no less than three alpha testers, at + * configure: Add `--x-includes' and `--x-libraries' options. + I think these are dopey, but no less than three alpha testers, at large sites, have said they have their X files installed in odd places. Implement them by setting C_SWITCH_X_SITE and LD_SWITCH_X_SITE in src/config.h. @@ -10978,8 +10982,8 @@ * Makefile.in (datadir, statedir, libdir): Make these all default to ${prefix}/lib. - (lispdir, locallisppath, etcdir, lockdir, archlibdir): Adjusted - to compensate. + (lispdir, locallisppath, etcdir, lockdir, archlibdir): + Adjust to compensate. * Makefile.in (install, install.sysv, install.xenix, install.aix): Install the etags and ctags man pages too. @@ -10994,7 +10998,7 @@ * configure (long_usage): Remove all traces of old arguments from usage messages, and document the options we do accept in more detail: -with-x... and --srcdir. - (options, boolean_opts): Deleted; we don't have enough options to + (options, boolean_opts): Delete; we don't have enough options to make this worthwhile. (prefix, bindir, lisppath, datadir, libdir, lockdir): Deleted, along with the code which supported them; these should be set as @@ -11019,8 +11023,8 @@ compile in don't exist yet, create them under the current directory. Note that the rest of the build process doesn't really support this. - Edit only the top Makefile. That should edit the others. Edit - into the makefile: `version', from lisp/version.el, `configname' + Edit only the top Makefile. That should edit the others. + Edit into the makefile: `version', from lisp/version.el, `configname' and `srcdir' from the configuration arguments, `CC' and `CONFIG_CFLAGS' as guessed from the presence or absence of GCC in the user's path, and LOADLIBES as gleaned from the system @@ -11263,8 +11267,8 @@ * make-dist: When setting up etc/COPYING, always nuke whatever is there, and then copy it in, to make sure we get a real file. - * make-dist: Don't try to distribute *.defns files any more. The - only such file was for simula.el, which has been superseded by a + * make-dist: Don't try to distribute *.defns files any more. + The only such file was for simula.el, which has been superseded by a version which doesn't have a separate .defns file. 1992-05-28 Ken Raeburn (Raeburn@Cygnus.COM) @@ -11435,10 +11439,10 @@ (mostlyclean): New target, synonymous with clean. (realclean): New target. Currently, this just calls the subdirectories's makefiles and then deletes config.status. - (INSTALL, INSTALLFLAGS, INSTALL_PROGRAM, INSTALL_DATA): New - variables. + (INSTALL, INSTALLFLAGS, INSTALL_PROGRAM, INSTALL_DATA): + New variables. Installation directory variables changed to conform. - (install, install.sysv, install.xenix, install.aix): Changed the + (install, install.sysv, install.xenix, install.aix): Change the code which copies the directories into their installed location to allow the installed locations to be in several different directories; the old version assumed that they would all be in diff --git a/Makefile.in b/Makefile.in index d929160c597..c27b6777162 100644 --- a/Makefile.in +++ b/Makefile.in @@ -361,7 +361,7 @@ blessmail: Makefile src FRC # etc. to be built without running into similar recursion problems. MAKEFILE_NAME = Makefile $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \ - $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) + $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) $(srcdir)/src/lisp.mk MAKE='$(MAKE)' ./config.status # Don't erase these files if make is interrupted while refreshing them. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e799ead207b..8c8f88dc89b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-10-18 Stefan Monnier + + * emacs-lisp/gv.el (cond): Same fix as before for `if'. + 2012-10-18 Glenn Morris * dired.el (dired-sort-toggle): Some ls implementations only allow @@ -7,8 +11,8 @@ 2012-10-17 Kenichi Handa - * international/mule.el (set-keyboard-coding-system): Recover - input meta mode when the new coding system doesn not use 8-bit. + * international/mule.el (set-keyboard-coding-system): + Recover input meta mode when the new coding system doesn not use 8-bit. Supply TERMINAL arg to set-input-meta-mode. 2012-10-17 Michael Heerdegen (tiny change) diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index 1a30d67fbbc..d6c91539a90 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el @@ -377,7 +377,8 @@ The return value is the last VAL in the list. (put 'cond 'gv-expander (lambda (do &rest branches) - (if (macroexp-small-p (funcall do 'dummy (lambda (_) 'dummy))) + (if (or (not lexical-binding) ;The other code requires lexical-binding. + (macroexp-small-p (funcall do 'dummy (lambda (_) 'dummy)))) ;; This duplicates the `do' code, which is a problem if that ;; code is large, but otherwise results in more efficient code. `(cond