Merge from trunk

4 files changed, 51 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3f1e287db34..2a8ac9b8131 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,19 @@
+2012-10-01  Fabrice Popineau  <fabrice.popineau@gmail.com>
+
+        * make-docfile.c (write_globals): Special-case
+        Fexit_recursive_edit and Fabort_recursive_edit as well, as
+        functions that are _Noreturn, to be consistent with
+        src/keyboard.c.
+
+2012-09-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * ntlib.c (gettimeofday): Copy from src/w32.c.  lib/gettime.c
+        needs this function.
+
+2012-09-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (obj): Add profiler.o.
+
 2012-09-17  Glenn Morris  <rgm@gnu.org>
 
         * ebrowse.c (version):
@@ -1038,7 +1054,7 @@
         (Asm_help, default_C_suffixes, default_C_help, Cplusplus_suffixes)
         (Cplusplus_help, Cjava_suffixes, Cobol_suffixes, Cstar_suffixes)
         (Erlang_suffixes, Erlang_help, Forth_suffixes, Forth_help)
-        (Fortran_suffixes, Fortran_help, HTML_suffixes,  HTML_help)
+        (Fortran_suffixes, Fortran_help, HTML_suffixes, HTML_help)
         (Lisp_suffixes, Lisp_help, Lua_suffixes, Lua_help)
         (Makefile_filenames, Makefile_help, Objc_suffixes, Objc_help)
         (Pascal_suffixes, Pascal_help, Perl_suffixes, Perl_interpreters)
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 2654387fb37..411b7057861 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -659,7 +659,9 @@ write_globals (void)
              special hacks.  */
           if (strcmp (globals[i].name, "Fthrow") == 0
               || strcmp (globals[i].name, "Ftop_level") == 0
-              || strcmp (globals[i].name, "Fkill_emacs") == 0)
+              || strcmp (globals[i].name, "Fkill_emacs") == 0
+              || strcmp (globals[i].name, "Fexit_recursive_edit") == 0
+              || strcmp (globals[i].name, "Fabort_recursive_edit") == 0)
             fprintf (outfile, "_Noreturn ");
           fprintf (outfile, "EXFUN (%s, ", globals[i].name);
           if (globals[i].value == -1)
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 64974b88b6f..23ef71de10c 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -140,7 +140,7 @@ obj =   dosfns.o msdos.o \
         process.o callproc.o unexw32.o \
         region-cache.o sound.o atimer.o \
         doprnt.o intervals.o textprop.o composite.o \
-        gnutls.o xml.o
+        gnutls.o xml.o profiler.o
 
 #
 # These are the lisp files that are loaded up in loadup.el
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 2cc791fb56a..feaad1c1bb7 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -29,9 +29,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/stat.h>
 #include <errno.h>
 #include <ctype.h>
+#include <sys/timeb.h>
 
 #include "ntlib.h"
 
+struct timezone
+{
+  int           tz_minuteswest; /* minutes west of Greenwich */
+  int           tz_dsttime;     /* type of dst correction */
+};
+
 #define MAXPATHLEN _MAX_PATH
 
 /* Emulate sleep...we could have done this with a define, but that
@@ -202,6 +209,29 @@ getpass (const char * prompt)
   return NULL;
 }
 
+/* This is needed because lib/gettime.c calls gettimeofday, which MSVC
+   doesn't have.  Copied from w32.c.  */
+void
+gettimeofday (struct timeval *tv, struct timezone *tz)
+{
+  struct _timeb tb;
+  _ftime (&tb);
+
+  tv->tv_sec = tb.time;
+  tv->tv_usec = tb.millitm * 1000L;
+  /* Implementation note: _ftime sometimes doesn't update the dstflag
+     according to the new timezone when the system timezone is
+     changed.  We could fix that by using GetSystemTime and
+     GetTimeZoneInformation, but that doesn't seem necessary, since
+     Emacs always calls gettimeofday with the 2nd argument NULL (see
+     current_emacs_time).  */
+  if (tz)
+    {
+      tz->tz_minuteswest = tb.timezone; /* minutes west of Greenwich  */
+      tz->tz_dsttime = tb.dstflag;      /* type of dst correction  */
+    }
+}
+
 int
 fchown (int fd, unsigned uid, unsigned gid)
 {