Now on revision 108316. ------------------------------------------------------------ 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); ------------------------------------------------------------ revno: 108315 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-19 12:17:04 -0700 message: Comments diff: === modified file 'Makefile.in' --- Makefile.in 2012-05-19 19:04:50 +0000 +++ Makefile.in 2012-05-19 19:17:04 +0000 @@ -517,6 +517,8 @@ ## http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00278.html ## I have no idea which platforms Emacs supports where cp -R does not ## work correctly, and therefore no idea when tar can be replaced. +## See also these comments from 2004 about cp -r working fine: +## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} umask 022 ; \ $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` ------------------------------------------------------------ revno: 108314 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-19 12:04:50 -0700 message: Comments diff: === modified file 'Makefile.in' --- Makefile.in 2012-05-19 18:57:10 +0000 +++ Makefile.in 2012-05-19 19:04:50 +0000 @@ -511,6 +511,12 @@ ## Is it really Emacs's job to create those directories? ## Should we also be ensuring they contain subdirs.el files? ## It would be easy to do, just use write_subdir. + +## Note that we use tar instead of plain old cp -R/-r because the latter +## is apparently not portable (even in 2012!). +## http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00278.html +## I have no idea which platforms Emacs supports where cp -R does not +## work correctly, and therefore no idea when tar can be replaced. install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} umask 022 ; \ $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` === modified file 'leim/Makefile.in' --- leim/Makefile.in 2012-05-19 06:34:59 +0000 +++ leim/Makefile.in 2012-05-19 19:04:50 +0000 @@ -131,7 +131,9 @@ ## Otherwise in a parallel build multiple Emacs instances could ## interfere with each other. If we used GNU make we could probably ## parallelize this without the need for an explicit rule for each -## file. +## file. Something like the pattern rule: +## quail/%.el: CXTERM-DIC/%.tit +## It doesn't seem possible to do this with VPATH and suffix rules. changed.tit: ${SUBDIRS} ${TIT_SOURCES} ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \ -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \ ------------------------------------------------------------ revno: 108313 fixes bug(s): http://debbugs.gnu.org/11518 author: Ulrich Mueller committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-19 11:57:10 -0700 message: * Makefile.in (install-etc): Respect DESTDIR. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-19 18:47:39 +0000 +++ ChangeLog 2012-05-19 18:57:10 +0000 @@ -1,3 +1,7 @@ +2012-05-19 Ulrich Mueller + + * Makefile.in (install-etc): Respect DESTDIR. (Bug#11518) + 2012-05-19 Paul Eggert * configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols, === modified file 'Makefile.in' --- Makefile.in 2012-05-19 18:47:39 +0000 +++ Makefile.in 2012-05-19 18:57:10 +0000 @@ -630,11 +630,11 @@ cd ${iconsrcdir} || exit 1; umask 022 ; \ for dir in */*/apps */*/mimetypes; do \ [ -d $${dir} ] || continue ; \ - ( cd $${thisdir}; ${MKDIR_P} ${icondir}/$${dir} ) ; \ + ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \ for icon in $${dir}/*.*; do \ [ -r $${icon} ] || continue ; \ ( cd $${thisdir}; \ - ${INSTALL_DATA} ${iconsrcdir}/$${icon} ${icondir}/$${icon} ) \ + ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${icon} ) \ || exit 1; \ done ; \ done ------------------------------------------------------------ revno: 108312 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-19 11:47:39 -0700 message: Undo part of previous change, in case it makes command line too long diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-19 18:04:49 +0000 +++ ChangeLog 2012-05-19 18:47:39 +0000 @@ -11,7 +11,6 @@ 2012-05-19 Glenn Morris * Makefile.in (install-arch-indep): Remove unneeded subshell. - Combine some rm commands. * Makefile.in (install-arch-indep): Remove unneeded chmod. Set permissions of lisp/subdirs.el. === modified file 'Makefile.in' --- Makefile.in 2012-05-19 07:20:16 +0000 +++ Makefile.in 2012-05-19 18:47:39 +0000 @@ -531,12 +531,16 @@ tar -xvf - && cat > /dev/null) || exit 1; \ [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ for subdir in `find $${dest} -type d -print` ; do \ - rm -f $${subdir}/.gitignore $${subdir}/.arch-inventory \ - $${subdir}/.DS_Store $${subdir}/ChangeLog* \ - $${subdir}/\#* $${subdir}/.\#* \ - $${subdir}/*~ $${subdir}/*.orig ; \ + rm -f $${subdir}/.gitignore ; \ + rm -f $${subdir}/.arch-inventory ; \ + rm -f $${subdir}/.DS_Store ; \ + rm -f $${subdir}/\#* ; \ + rm -f $${subdir}/.\#* ; \ + rm -f $${subdir}/*~ ; \ + rm -f $${subdir}/*.orig ; \ + rm -f $${subdir}/ChangeLog* ; \ [ "$${dir}" != "${srcdir}/etc" ] && \ - rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \ + rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \ done ; \ find $${dest} -exec chown $${installuser} {} ';' ;\ done ------------------------------------------------------------ revno: 108311 committer: Stefan Monnier branch nick: trunk timestamp: Sat 2012-05-19 14:28:32 -0400 message: * lisp/emacs-lisp/bytecomp.el (byte-compile-root-dir): New var. (byte-compile-warning-prefix, batch-byte-compile-file): Use it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-19 03:00:48 +0000 +++ lisp/ChangeLog 2012-05-19 18:28:32 +0000 @@ -1,3 +1,8 @@ +2012-05-19 Stefan Monnier + + * emacs-lisp/bytecomp.el (byte-compile-root-dir): New var. + (byte-compile-warning-prefix, batch-byte-compile-file): Use it. + 2012-05-19 Jay Belanger * calc/calc.el (calc-ensure-consistent-units): New variable. === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2012-05-03 02:39:23 +0000 +++ lisp/emacs-lisp/bytecomp.el 2012-05-19 18:28:32 +0000 @@ -1002,12 +1002,14 @@ (defvar byte-compile-last-warned-form nil) (defvar byte-compile-last-logged-file nil) +(defvar byte-compile-root-dir nil + "Directory relative to which file names in error messages are written.") ;; This is used as warning-prefix for the compiler. ;; It is always called with the warnings buffer current. (defun byte-compile-warning-prefix (level entry) (let* ((inhibit-read-only t) - (dir default-directory) + (dir (or byte-compile-root-dir default-directory)) (file (cond ((stringp byte-compile-current-file) (format "%s:" (file-relative-name byte-compile-current-file dir))) @@ -4515,29 +4517,30 @@ (kill-emacs (if error 1 0)))) (defun batch-byte-compile-file (file) - (if debug-on-error - (byte-compile-file file) - (condition-case err - (byte-compile-file file) - (file-error - (message (if (cdr err) - ">>Error occurred processing %s: %s (%s)" - ">>Error occurred processing %s: %s") - file - (get (car err) 'error-message) - (prin1-to-string (cdr err))) - (let ((destfile (byte-compile-dest-file file))) - (if (file-exists-p destfile) - (delete-file destfile))) - nil) - (error - (message (if (cdr err) - ">>Error occurred processing %s: %s (%s)" - ">>Error occurred processing %s: %s") - file - (get (car err) 'error-message) - (prin1-to-string (cdr err))) - nil)))) + (let ((byte-compile-root-dir (or byte-compile-root-dir default-directory))) + (if debug-on-error + (byte-compile-file file) + (condition-case err + (byte-compile-file file) + (file-error + (message (if (cdr err) + ">>Error occurred processing %s: %s (%s)" + ">>Error occurred processing %s: %s") + file + (get (car err) 'error-message) + (prin1-to-string (cdr err))) + (let ((destfile (byte-compile-dest-file file))) + (if (file-exists-p destfile) + (delete-file destfile))) + nil) + (error + (message (if (cdr err) + ">>Error occurred processing %s: %s (%s)" + ">>Error occurred processing %s: %s") + file + (get (car err) 'error-message) + (prin1-to-string (cdr err))) + nil))))) (defun byte-compile-refresh-preloaded () "Reload any Lisp file that was changed since Emacs was dumped. ------------------------------------------------------------ revno: 108310 committer: Paul Eggert branch nick: trunk timestamp: Sat 2012-05-19 11:04:49 -0700 message: Remove unused HAVE_* symbols for functions. * configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols, getdomainname, mblen (twice), mbrlen (twice), mbsinit, ualarm, getsockopt, setsockopt, mremap, mempcpy. * admin/CPP-DEFINES (HAVE_GETDOMAINNAME): Remove. * msdos/sed2v2.inp (HAVE_MBLEN): Remove. * msdos/sed2x.inp (HAVE_XSETWMPROTOCOLS): Remove. * nt/config.nt (HAVE_GETDOMAINNAME, HAVE_XSETWMPROTOCOLS) (HAVE_GETSOCKOPT, HAVE_SETSOCKOPT): Remove; not needed. * src/s/ms-w32.h (HAVE_GETDOMAINNAME): Remove; not needed. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-19 08:49:08 +0000 +++ ChangeLog 2012-05-19 18:04:49 +0000 @@ -1,5 +1,9 @@ 2012-05-19 Paul Eggert + * configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols, + getdomainname, mblen (twice), mbrlen (twice), mbsinit, ualarm, + getsockopt, setsockopt, mremap, mempcpy. + * configure.in (machine): Do not set to 'vax', since src/m/vax.h is being removed. (AC_CHECK_FUNCS): Remove ftime. === modified file 'admin/CPP-DEFINES' --- admin/CPP-DEFINES 2012-05-19 08:49:08 +0000 +++ admin/CPP-DEFINES 2012-05-19 18:04:49 +0000 @@ -121,7 +121,6 @@ HAVE_FREXP HAVE_FSYNC HAVE_GETCWD -HAVE_GETDOMAINNAME HAVE_GETHOSTNAME HAVE_GETLOADAVG HAVE_GETPAGESIZE === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-05-19 08:49:08 +0000 +++ admin/ChangeLog 2012-05-19 18:04:49 +0000 @@ -1,5 +1,7 @@ 2012-05-19 Paul Eggert + * CPP-DEFINES (HAVE_GETDOMAINNAME): Remove. + * CPP-DEFINES (HAVE_FTIME): Remove. 2012-05-02 Glenn Morris === modified file 'configure.in' --- configure.in 2012-05-19 08:49:08 +0000 +++ configure.in 2012-05-19 18:04:49 +0000 @@ -1873,7 +1873,7 @@ fi AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \ -XScreenNumberOfScreen XSetWMProtocols) +XScreenNumberOfScreen) fi if test "${window_system}" = "x11"; then @@ -2773,15 +2773,15 @@ AC_SUBST(BLESSMAIL_TARGET) -AC_CHECK_FUNCS(gethostname getdomainname \ +AC_CHECK_FUNCS(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) === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2012-04-21 09:48:42 +0000 +++ msdos/ChangeLog 2012-05-19 18:04:49 +0000 @@ -1,3 +1,8 @@ +2012-05-19 Paul Eggert + + * sed2v2.inp (HAVE_MBLEN): Remove. + * sed2x.inp (HAVE_XSETWMPROTOCOLS): Remove. + 2012-04-21 Eli Zaretskii * sedleim.inp (RUN_EMACS): Replace BUILT_EMACS with EMACS. === modified file 'msdos/sed2v2.inp' --- msdos/sed2v2.inp 2012-05-02 07:20:29 +0000 +++ msdos/sed2v2.inp 2012-05-19 18:04:49 +0000 @@ -46,7 +46,6 @@ /^#undef HAVE_SETRLIMIT *$/s/^.*$/#define HAVE_SETRLIMIT 1/ /^#undef HAVE_GETRUSAGE *$/s/^.*$/#define HAVE_GETRUSAGE 1/ /^#undef HAVE_TM_GMTOFF *$/s/^.*$/#define HAVE_TM_GMTOFF 1/ -/^#undef HAVE_MBLEN *$/s/^.*$/#define HAVE_MBLEN 1/ /^#undef HAVE_STRUCT_TIMEZONE *$/s/^.*$/#define HAVE_STRUCT_TIMEZONE 1/ /^#undef HAVE_SIZE_T *$/s/^.*$/#define HAVE_SIZE_T 1/ /^#undef HAVE_MKSTEMP *$/s/^.*$/#define HAVE_MKSTEMP 1/ @@ -119,4 +118,3 @@ # might be defined in sys/config.h we include at the top of config.h. /^#undef BSTRING/s|#undef|# undef| /^#undef .*$/s|^.*$|/* & */| - === modified file 'msdos/sed2x.inp' --- msdos/sed2x.inp 2012-01-19 07:21:25 +0000 +++ msdos/sed2x.inp 2012-05-19 18:04:49 +0000 @@ -20,6 +20,5 @@ /^#undef HAVE_X11 *$/s/undef/define/ /^#undef HAVE_X_MENU *$/s/undef/define/ /^#undef HAVE_XSCREENNUMBEROFSCREEN *$/s/undef/define/ -/^#undef HAVE_XSETWMPROTOCOLS *$/s/undef/define/ /^#undef HAVE_SELECT *$/s/undef/define/ === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-05-19 08:49:08 +0000 +++ nt/ChangeLog 2012-05-19 18:04:49 +0000 @@ -1,5 +1,8 @@ 2012-05-19 Paul Eggert + * config.nt (HAVE_GETDOMAINNAME, HAVE_XSETWMPROTOCOLS) + (HAVE_GETSOCKOPT, HAVE_SETSOCKOPT): Remove; not needed. + * config.nt (HAVE_FTIME): Remove undef; not needed. 2012-05-01 Glenn Morris === modified file 'nt/config.nt' --- nt/config.nt 2012-05-19 08:49:08 +0000 +++ nt/config.nt 2012-05-19 18:04:49 +0000 @@ -179,7 +179,6 @@ #undef GETTIMEOFDAY_ONE_ARGUMENT #endif #undef HAVE_GETHOSTNAME -#undef HAVE_GETDOMAINNAME #undef HAVE_DUP2 #undef HAVE_RENAME #undef HAVE_CLOSEDIR @@ -205,7 +204,6 @@ #undef HAVE_XRMSETDATABASE #undef HAVE_XSCREENRESOURCESTRING #undef HAVE_XSCREENNUMBEROFSCREEN -#undef HAVE_XSETWMPROTOCOLS #undef HAVE_MKDIR #undef HAVE_RMDIR @@ -244,8 +242,6 @@ #define HAVE_SENDTO 1 #define HAVE_RECVFROM 1 -#define HAVE_GETSOCKOPT 1 -#define HAVE_SETSOCKOPT 1 #define HAVE_GETSOCKNAME 1 #define HAVE_GETPEERNAME 1 #define HAVE_SNPRINTF 1 === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-19 08:49:08 +0000 +++ src/ChangeLog 2012-05-19 18:04:49 +0000 @@ -1,5 +1,7 @@ 2012-05-19 Paul Eggert + * s/ms-w32.h (HAVE_GETDOMAINNAME): Remove; not needed. + * m/vax.h: Remove; no longer needed since HAVE_FTIME is being removed. * s/ms-w32.h (HAVE_FTIME): Remove; not needed. === modified file 'src/s/ms-w32.h' --- src/s/ms-w32.h 2012-05-19 08:49:08 +0000 +++ src/s/ms-w32.h 2012-05-19 18:04:49 +0000 @@ -122,7 +122,6 @@ #define HAVE_GETTIMEOFDAY 1 #define HAVE_GETHOSTNAME 1 -#undef HAVE_GETDOMAINNAME #define HAVE_DUP2 1 #define HAVE_RENAME 1 #define HAVE_CLOSEDIR 1 ------------------------------------------------------------ revno: 108309 committer: Jay Belanger branch nick: trunk timestamp: Sat 2012-05-19 09:59:47 -0500 message: * calc/calc-units.el (math-consistent-units-p): Accept unit systems as consistent units. diff: === modified file 'lisp/calc/calc-units.el' --- lisp/calc/calc-units.el 2012-05-19 03:11:09 +0000 +++ lisp/calc/calc-units.el 2012-05-19 14:59:47 +0000 @@ -921,9 +921,12 @@ (math-single-units-in-expr-p (nth 1 expr)))) (t 'wrong))) -(defun math-consistent-units-p (expr1 expr2) - "Non-nil if EXPR1 and EXPR2 have consistent units." - (math-numberp (math-get-units (list '/ expr1 expr2)))) +(defun math-consistent-units-p (expr newunits) + "Non-nil if EXPR and NEWUNITS have consistent units." + (or + (and (eq (car-safe newunits) 'var) + (assq (nth 1 newunits) math-standard-units-systems)) + (math-numberp (math-get-units (list '/ expr newunits))))) (defun math-check-unit-consistency (expr units) "Give an error if EXPR and UNITS do not have consistent units." ------------------------------------------------------------ revno: 108308 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-19 06:17:29 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/config.in' --- autogen/config.in 2012-05-01 10:17:25 +0000 +++ autogen/config.in 2012-05-19 10:17:29 +0000 @@ -254,9 +254,6 @@ /* Define to 1 if you have the `fsync' function. */ #undef HAVE_FSYNC -/* Define to 1 if you have the `ftime' function. */ -#undef HAVE_FTIME - /* Define to 1 if you have the `gai_strerror' function. */ #undef HAVE_GAI_STRERROR === modified file 'autogen/configure' --- autogen/configure 2012-05-18 10:17:28 +0000 +++ autogen/configure 2012-05-19 10:17:29 +0000 @@ -4457,7 +4457,6 @@ m68k-*) machine=m68k ;; powerpc-*) machine=macppc ;; sparc*-) machine=sparc ;; - vax-*) machine=vax ;; esac ;; @@ -4470,7 +4469,6 @@ i386-*) machine=intel386 ;; powerpc-*) machine=macppc ;; sparc*) machine=sparc ;; - vax-*) machine=vax ;; esac ;; @@ -10133,6 +10131,7 @@ docdir="\${ns_appresdir}/etc" etcdir="\${ns_appresdir}/etc" infodir="\${ns_appresdir}/info" + mandir="\${ns_appresdir}/man" lispdir="\${ns_appresdir}/lisp" LEIM_INSTALLDIR="\${ns_appresdir}/leim" INSTALL_ARCH_INDEP_EXTRA= @@ -14315,7 +14314,7 @@ for ac_func in gethostname getdomainname \ rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \ -random lrand48 logb frexp fmod rint cbrt ftime setsid \ +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 \ ------------------------------------------------------------ revno: 108307 committer: Paul Eggert branch nick: trunk timestamp: Sat 2012-05-19 01:49:08 -0700 message: Remove no-longer-used macro HAVE_FTIME. * configure.in (machine): Do not set to 'vax', since src/m/vax.h is being removed. (AC_CHECK_FUNCS): Remove ftime. * admin/CPP-DEFINES (HAVE_FTIME): Remove. * nt/config.nt (HAVE_FTIME): Remove undef; not needed. * src/m/vax.h: Remove; no longer needed since HAVE_FTIME is being removed. * src/s/ms-w32.h (HAVE_FTIME): Remove; not needed. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-19 07:20:16 +0000 +++ ChangeLog 2012-05-19 08:49:08 +0000 @@ -1,3 +1,9 @@ +2012-05-19 Paul Eggert + + * configure.in (machine): Do not set to 'vax', since src/m/vax.h + is being removed. + (AC_CHECK_FUNCS): Remove ftime. + 2012-05-19 Glenn Morris * Makefile.in (install-arch-indep): Remove unneeded subshell. === modified file 'admin/CPP-DEFINES' --- admin/CPP-DEFINES 2011-11-20 09:24:06 +0000 +++ admin/CPP-DEFINES 2012-05-19 08:49:08 +0000 @@ -120,7 +120,6 @@ HAVE_FPATHCONF HAVE_FREXP HAVE_FSYNC -HAVE_FTIME HAVE_GETCWD HAVE_GETDOMAINNAME HAVE_GETHOSTNAME === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-05-02 07:12:52 +0000 +++ admin/ChangeLog 2012-05-19 08:49:08 +0000 @@ -1,3 +1,7 @@ +2012-05-19 Paul Eggert + + * CPP-DEFINES (HAVE_FTIME): Remove. + 2012-05-02 Glenn Morris * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit". === modified file 'configure.in' --- configure.in 2012-05-18 17:49:24 +0000 +++ configure.in 2012-05-19 08:49:08 +0000 @@ -466,7 +466,6 @@ m68k-*) machine=m68k ;; powerpc-*) machine=macppc ;; sparc*-) machine=sparc ;; - vax-*) machine=vax ;; esac ;; @@ -479,7 +478,6 @@ i386-*) machine=intel386 ;; powerpc-*) machine=macppc ;; sparc*) machine=sparc ;; - vax-*) machine=vax ;; esac ;; @@ -2777,7 +2775,7 @@ AC_CHECK_FUNCS(gethostname getdomainname \ rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \ -random lrand48 logb frexp fmod rint cbrt ftime setsid \ +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 \ === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-05-01 00:30:11 +0000 +++ nt/ChangeLog 2012-05-19 08:49:08 +0000 @@ -1,3 +1,7 @@ +2012-05-19 Paul Eggert + + * config.nt (HAVE_FTIME): Remove undef; not needed. + 2012-05-01 Glenn Morris * config.nt (HAVE_LIBNCURSES): Remove undef; not needed. === modified file 'nt/config.nt' --- nt/config.nt 2012-05-02 07:20:29 +0000 +++ nt/config.nt 2012-05-19 08:49:08 +0000 @@ -221,7 +221,6 @@ #undef HAVE_FMOD #undef HAVE_RINT #undef HAVE_CBRT -#undef HAVE_FTIME #undef HAVE_RES_INIT /* For -lresolv on Suns. */ #undef HAVE_SETSID #undef HAVE_FPATHCONF === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-18 08:36:50 +0000 +++ src/ChangeLog 2012-05-19 08:49:08 +0000 @@ -1,3 +1,8 @@ +2012-05-19 Paul Eggert + + * m/vax.h: Remove; no longer needed since HAVE_FTIME is being removed. + * s/ms-w32.h (HAVE_FTIME): Remove; not needed. + 2012-05-18 Eli Zaretskii Fix compilation with -DGLYPH_DEBUG=1 on MS-Windows. === removed file 'src/m/vax.h' --- src/m/vax.h 2012-01-19 07:21:25 +0000 +++ src/m/vax.h 1970-01-01 00:00:00 +0000 @@ -1,23 +0,0 @@ -/* machine description file for vax. - -Copyright (C) 1985-1986, 2001-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 . */ - - -/* #define vax -- appears to be done automatically */ - -#define HAVE_FTIME === modified file 'src/s/ms-w32.h' --- src/s/ms-w32.h 2012-03-29 20:06:39 +0000 +++ src/s/ms-w32.h 2012-05-19 08:49:08 +0000 @@ -147,7 +147,6 @@ #define HAVE_FMOD 1 #undef HAVE_RINT #undef HAVE_CBRT -#define HAVE_FTIME 1 #undef HAVE_RES_INIT /* For -lresolv on Suns. */ #undef HAVE_SETSID #undef HAVE_FPATHCONF ------------------------------------------------------------ revno: 108306 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-19 00:20:16 -0700 message: * Makefile.in (install-arch-indep): Remove unneeded subshell. Combine some rm commands. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-19 06:45:24 +0000 +++ ChangeLog 2012-05-19 07:20:16 +0000 @@ -1,5 +1,8 @@ 2012-05-19 Glenn Morris + * Makefile.in (install-arch-indep): Remove unneeded subshell. + Combine some rm commands. + * Makefile.in (install-arch-indep): Remove unneeded chmod. Set permissions of lisp/subdirs.el. === modified file 'Makefile.in' --- Makefile.in 2012-05-19 06:45:24 +0000 +++ Makefile.in 2012-05-19 07:20:16 +0000 @@ -525,24 +525,20 @@ continue ; \ rm -rf $${dest} ; \ umask 022; ${MKDIR_P} $${dest} ; \ - (echo "Copying $${dir} to $${dest}..." ; \ - (cd $${dir}; tar -chf - . ) \ - | (cd $${dest}; umask 022; \ - tar -xvf - && cat > /dev/null) || exit 1; \ - [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ - find $${dest} -exec chown $${installuser} {} ';' ;\ - for subdir in `find $${dest} -type d -print` ; do \ - rm -f $${subdir}/.gitignore ; \ - rm -f $${subdir}/.arch-inventory ; \ - rm -f $${subdir}/.DS_Store ; \ - rm -f $${subdir}/\#* ; \ - rm -f $${subdir}/.\#* ; \ - rm -f $${subdir}/*~ ; \ - rm -f $${subdir}/*.orig ; \ - [ "$${dir}" != "${srcdir}/etc" ] && \ - rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \ - rm -f $${subdir}/ChangeLog* ; \ - done) ; \ + echo "Copying $${dir} to $${dest}..." ; \ + (cd $${dir}; tar -chf - . ) \ + | (cd $${dest}; umask 022; \ + tar -xvf - && cat > /dev/null) || exit 1; \ + [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ + for subdir in `find $${dest} -type d -print` ; do \ + rm -f $${subdir}/.gitignore $${subdir}/.arch-inventory \ + $${subdir}/.DS_Store $${subdir}/ChangeLog* \ + $${subdir}/\#* $${subdir}/.\#* \ + $${subdir}/*~ $${subdir}/*.orig ; \ + [ "$${dir}" != "${srcdir}/etc" ] && \ + rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \ + done ; \ + find $${dest} -exec chown $${installuser} {} ';' ;\ done -rm -f $(DESTDIR)${lispdir}/subdirs.el umask 022; $(srcdir)/update-subdirs $(DESTDIR)${lispdir} ------------------------------------------------------------ revno: 108305 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-05-18 23:45:24 -0700 message: * Makefile.in (install-arch-indep): Remove unneeded chmod. Set permissions of lisp/subdirs.el. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-19 06:42:26 +0000 +++ ChangeLog 2012-05-19 06:45:24 +0000 @@ -1,5 +1,8 @@ 2012-05-19 Glenn Morris + * Makefile.in (install-arch-indep): Remove unneeded chmod. + Set permissions of lisp/subdirs.el. + * Makefile.in (SUBDIR): Add leim. Update users. * Makefile.in (lib, lib-src, lisp): Check cd return value. === modified file 'Makefile.in' --- Makefile.in 2012-05-19 06:42:26 +0000 +++ Makefile.in 2012-05-19 06:45:24 +0000 @@ -532,7 +532,6 @@ [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ find $${dest} -exec chown $${installuser} {} ';' ;\ for subdir in `find $${dest} -type d -print` ; do \ - chmod a+rx $${subdir} ; \ rm -f $${subdir}/.gitignore ; \ rm -f $${subdir}/.arch-inventory ; \ rm -f $${subdir}/.DS_Store ; \ @@ -546,7 +545,7 @@ done) ; \ done -rm -f $(DESTDIR)${lispdir}/subdirs.el - $(srcdir)/update-subdirs $(DESTDIR)${lispdir} + umask 022; $(srcdir)/update-subdirs $(DESTDIR)${lispdir} subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \ ${write_subdir} subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \ @@ -560,6 +559,8 @@ done ) -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} +# The last chmod isn't needed at present. + ## We install only the relevant DOC file if possible ## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*. ## (Note "otherwise" is inaccurate since 2009-08-23.)