From: Eli Zaretskii Date: Sat, 30 Jun 2012 15:55:27 +0000 (+0300) Subject: Adapt the MS-DOS build to the latest changes. X-Git-Tag: emacs-24.2.90~1199^2~273 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9240d7a6eb3d8aaca76cd3abc8f099b6ecaff0a;p=emacs.git Adapt the MS-DOS build to the latest changes. msdos/mainmake.v2 (bootstrap-clean): Do a maintainer-clean in lib, not bootstrap-clean (which doesn't exist). msdos/inttypes.h (PRIuMAX) [__DJGPP__ < 2.04]: Define to "llu". msdos/sedleim.inp (MKDIR_P): Edit to DOS "md" command. msdos/sed1v2.inp: (LIB_CLOCK_GETTIME): Edit to empty. Remove lines that invoke PAXCTL. (clean): Fix recipe not to run Unixy shell commands. msdos/sed2v2.inp (GETTIMEOFDAY_TIMEZONE): Edit to 'struct timezone'. (HAVE_STRNCASECMP): Edit to 1. msdos/sed3v2.inp (LIB_CLOCK_GETTIME): Edit to empty. (C_SWITCH_SYSTEM): Add "-I../msdos". msdos/sedlibmk.inp (GNULIB_GETTIMEOFDAY, GNULIB_PSELECT) (GNULIB_SELECT, HAVE_STRUCT_TIMEVAL, HAVE_SYS_SELECT_H) (HAVE_SYS_TIME_H, NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H) (NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H, NEXT_SYS_SELECT_H) (NEXT_SYS_TIME_H, REPLACE_GETTIMEOFDAY, REPLACE_PSELECT) (REPLACE_STRUCT_TIMEVAL): Edit to appropriate values. (BUILT_SOURCES): Edit out sys/select.h and sys/time.h. (mostlyclean-local, distclean-generic): Fix recipe not to run Unixy shell commands. src/sysselect.h [DOS_NT]: Don't include sys/select.h. src/sysselect.h (pselect) [!HAVE_PSELECT]: Redirect to sys_select. src/sysdep.c: Don't include dos.h and dosfns.h. src/process.c (sys_select): src/msdos.c (sys_select): Accept one more argument and ignore it. src/msdos.c (event_timestamp, sys_select): Use gnulib's gettime; adapt data types and code to that. src/dosfns.c: src/msdos.c (gettime, settime): Define away the prototypes in dos.h, which clashes with the gnulib function of the same name. src/ w32proc.c (sys_select): Accept and ignore one more argument. src/w32.c (emacs_gnutls_pull): Call select with one more argument. lisp/emacs-lisp/timer.el (timer-until): Subtract results of float-time, instead of taking float-time of the result of time-subtract, since float-time signals an error for negative time arguments. --- c9240d7a6eb3d8aaca76cd3abc8f099b6ecaff0a diff --cc lisp/ChangeLog index 4d0f1e5afeb,975478e1732..ca425d5b5ea --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,39 -1,10 +1,46 @@@ + 2012-06-30 Eli Zaretskii + + * emacs-lisp/timer.el (timer-until): Subtract results of + float-time, instead of taking float-time of the result of + time-subtract, since float-time signals an error for negative time + arguments. + +2012-06-30 Chong Yidong + + * xml.el (xml-*-re): Convert defvars into defconsts, and + eval-and-compile them so eval-and-compile works on derivatives. + (xml--entity-replacement-text): Use eval-and-comple. + +2012-06-30 Michael Albinus + + * vc/vc-git.el (vc-git-registered): Use cache property + `git-registered'. + (vc-git-mode-line-string): Call `vc-working-revision' instead of + `vc-git-working-revision' in order to benefit from the cache. + (vc-git-root): Use cache property `git-root'. + +2012-06-30 Dmitry Gutov + + * vc/vc-hooks.el (vc-before-save): Clear cache if file has been + removed (likely outside Emacs). + +2012-06-30 Stefan Monnier + + * emacs-lisp/cl-lib.el: Require macroexp for its macros. + +2012-06-30 Chong Yidong + + * xml.el: Implement XML parameter entities. + (xml-parameter-entity-alist): New variable. + (xml-parse-region, xml-parse-fragment): Preserve previous values + of xml-entity-alist and xml-parameter-entity-alist, so that + repeated calls on different documents do not change them. + (xml-parse-tag): Fix doctype regexp. + (xml--entity-replacement-text): New function. + (xml-parse-dtd): Use it. Don't handle system entities; doing that + properly requires url retrieval which is unimplemented. + (xml-escape-string): Doc fix. + 2012-06-30 Stefan Monnier * emacs-lisp/cl-lib.el (cl-pushnew): Use macroexp-let2. diff --cc src/ChangeLog index ce817c19894,c88007fd694..9794c5ad4cd --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,14 -1,24 +1,39 @@@ + 2012-06-30 Eli Zaretskii + ++ * w32proc.c (sys_select): Accept and ignore one more argument. ++ ++ * w32.c (emacs_gnutls_pull): Call select with one more argument. ++ + * sysselect.h [DOS_NT]: Don't include sys/select.h. + + * s/ms-w32.h (select, pselect): Don't define here, they are + defined in sysselect.h + + * sysselect.h (pselect) [!HAVE_PSELECT]: Redirect to sys_select. + + * sysdep.c: Don't include dos.h and dosfns.h. + + * process.c (sys_select): + * msdos.c (sys_select): Accept one more argument and ignore it. + + * msdos.c (event_timestamp, sys_select): Use gnulib's gettime; + adapt data types and code to that. + + * dosfns.c: + * msdos.c (gettime, settime): Define away the prototypes in dos.h, + which clashes with the gnulib function of the same name. + +2012-06-30 Andreas Schwab + + * font.c (font_style_to_value, font_style_symbolic) + (font_prop_validate_style): Add type checks for values in + font_style_table. + + * lisp.h (CHECK_RANGED_INTEGER): Make value to check the first + argument. + * character.c, charset.c, menu.c, process.c, window.c: Adjust all + uses. + 2012-06-29 Eli Zaretskii * xdisp.c (try_window_id): Undo last change. diff --cc src/s/ms-w32.h index 38e368e5bd2,9bfbde31065..3a95bffadb8 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@@ -233,8 -233,6 +233,8 @@@ struct sigaction #define read sys_read #define rename sys_rename #define rmdir sys_rmdir +#define select sys_select - #define pselect sys_select ++#define pselect sys_select #define sleep sys_sleep #define strerror sys_strerror #undef unlink diff --cc src/sysselect.h index 328372d427c,27a38fd687f..2dbbede2bff --- a/src/sysselect.h +++ b/src/sysselect.h @@@ -52,3 -52,7 +52,7 @@@ along with GNU Emacs. If not, see 0) continue; /* Try again. */ diff --cc src/w32proc.c index 3864d15623a,3864d15623a..afc1b21fdde --- a/src/w32proc.c +++ b/src/w32proc.c @@@ -1080,7 -1080,7 +1080,7 @@@ extern int proc_buffered_char[] int sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, -- EMACS_TIME *timeout) ++ EMACS_TIME *timeout, void *ignored) { SELECT_TYPE orfds; DWORD timeout_ms, start_time;