+ 2012-06-30 Eli Zaretskii <eliz@gnu.org>
+
+ * 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 <cyd@gnu.org>
+
+ * 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 <michael.albinus@gmx.de>
+
+ * 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 <dgutov@yandex.ru>
+
+ * vc/vc-hooks.el (vc-before-save): Clear cache if file has been
+ removed (likely outside Emacs).
+
+2012-06-30 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * emacs-lisp/cl-lib.el: Require macroexp for its macros.
+
+2012-06-30 Chong Yidong <cyd@gnu.org>
+
+ * 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 <monnier@iro.umontreal.ca>
* emacs-lisp/cl-lib.el (cl-pushnew): Use macroexp-let2.
+ 2012-06-30 Eli Zaretskii <eliz@gnu.org>
+
++ * 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 <schwab@linux-m68k.org>
+
+ * 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 <eliz@gnu.org>
* xdisp.c (try_window_id): Undo last change.
#define read sys_read
#define rename sys_rename
#define rmdir sys_rmdir
- #define pselect sys_select
+#define select sys_select
++#define pselect sys_select
#define sleep sys_sleep
#define strerror sys_strerror
#undef unlink
#if !defined (HAVE_SELECT)
#define select sys_select
#endif
-#ifndef HAVE_PSELECT
+
++#ifdef MSDOS
+ #define pselect sys_select
+ #endif
/* Use select with the timeout to poll the selector. */
sc = select (fd + 1, &fdset, (SELECT_TYPE *)0, (SELECT_TYPE *)0,
-- &timeout);
++ &timeout, NULL);
if (sc > 0)
continue; /* Try again. */
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;