[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110772: Adapt MSDOS port to latest changes.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110772 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-11-03 15:58:33 +0200
message:
  Adapt MSDOS port to latest changes.
  
   config.bat: Copy lib/execinfo.in.h to lib/execinfo.in-h if needed.
  
   msdos/sedlibmk.inp: Sync with changes in lib/Makefile.in.
   (HAVE_DECL_ENVIRON, GNULIB_ENVIRON): Edit to require declaration
   through lib/unistd.h.
   msdos/sed1v2.inp: Sync with changes in src/Makefile.in.
   msdos/sed2v2.inp: Sync with changes in src/config.in.
  
   src/lisp.mk: Adjust comments to the fact that term/internal is now
   loaded from loadup.el.
   src/msdos.c (msdos_abort): Rename from emacs_abort, and make static.
   (msdos_fatal_signal): New function.
   (XMenuActivate): Adjust the call to kbd_buffer_events_waiting to
   its argument list.
   src/conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Define to "inline"
   for GCC versions before 4.
   (emacs_raise): Define to call msdos_fatal_signal.
  
   lisp/term/pc-win.el: Don't load term/internal from here.
   lisp/loadup.el: Load term/internal from here.
modified:
  ChangeLog
  config.bat
  lisp/ChangeLog
  lisp/loadup.el
  lisp/term/pc-win.el
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sed2v2.inp
  msdos/sedlibmk.inp
  src/ChangeLog
  src/conf_post.h
  src/lisp.mk
  src/msdos.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-10-26 18:35:36 +0000
+++ b/ChangeLog 2012-11-03 13:48:33 +0000
@@ -1,3 +1,7 @@
+2012-11-03  Eli Zaretskii  <address@hidden>
+
+       * config.bat: Copy lib/execinfo.in.h to lib/execinfo.in-h if needed.
+
 2012-10-26  Glenn Morris  <address@hidden>
 
        * Makefile.in (EMACS_NAME): New variable.

=== modified file 'config.bat'
--- a/config.bat        2012-07-28 23:05:32 +0000
+++ b/config.bat        2012-11-03 13:48:33 +0000
@@ -264,6 +264,7 @@
 Rem Rename files like djtar on plain DOS filesystem would.
 If Exist build-aux\snippet\c++defs.h update build-aux/snippet/c++defs.h 
build-aux/snippet/cxxdefs.h
 If Exist alloca.in.h update alloca.in.h alloca.in-h
+If Exist execinfo.in.h update execinfo.in.h execinfo.in-h
 If Exist getopt.in.h update getopt.in.h getopt.in-h
 If Exist stdalign.in.h update stdalign.in.h stdalign.in-h
 If Exist stdbool.in.h update stdbool.in.h stdbool.in-h

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-03 12:20:02 +0000
+++ b/lisp/ChangeLog    2012-11-03 13:58:33 +0000
@@ -1,3 +1,9 @@
+2012-11-03  Eli Zaretskii  <address@hidden>
+
+       * term/pc-win.el: Don't load term/internal from here.
+
+       * loadup.el: Load term/internal from here.
+
 2012-11-03  Fabián Ezequiel Gallina  <address@hidden>
 
        * progmodes/python.el (inferior-python-mode): Fix hang in

=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el    2012-10-20 10:01:19 +0000
+++ b/lisp/loadup.el    2012-11-03 13:56:02 +0000
@@ -257,6 +257,7 @@
       (load "dos-vars")
       ;; Don't load term/common-win: it isn't appropriate for the `pc'
       ;; ``window system'', which generally behaves like a terminal.
+      (load "term/internal")
       (load "term/pc-win")
       (load "ls-lisp")
       (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el

=== modified file 'lisp/term/pc-win.el'
--- a/lisp/term/pc-win.el       2012-03-06 19:48:46 +0000
+++ b/lisp/term/pc-win.el       2012-11-03 13:56:02 +0000
@@ -40,8 +40,6 @@
     (error "%s: Loading pc-win.el but not compiled for MS-DOS"
           (invocation-name)))
 
-(load "term/internal" nil t)
-
 (declare-function msdos-remember-default-colors "msdos.c")
 (declare-function w16-set-clipboard-data "w16select.c")
 (declare-function w16-get-clipboard-data "w16select.c")

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2012-10-08 09:32:40 +0000
+++ b/msdos/ChangeLog   2012-11-03 13:48:33 +0000
@@ -1,3 +1,13 @@
+2012-11-03  Eli Zaretskii  <address@hidden>
+
+       * sedlibmk.inp: Sync with changes in lib/Makefile.in.
+       (HAVE_DECL_ENVIRON, GNULIB_ENVIRON): Edit to require declaration
+       through lib/unistd.h.
+
+       * sed1v2.inp: Sync with changes in src/Makefile.in.
+
+       * sed2v2.inp: Sync with changes in src/config.in.
+
 2012-10-08  Eli Zaretskii  <address@hidden>
 
        * sed1v2.inp (W32_LIBS, W32_OBJ): Edit to empty.

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2012-10-08 09:32:40 +0000
+++ b/msdos/sed1v2.inp  2012-11-03 13:48:33 +0000
@@ -55,11 +55,11 @@
 /^LIB_STANDARD *=/s/@LIB_STANDARD@//
 /^LIB_MATH *=/s/@LIB_MATH@/-lm/
 /^LIB_PTHREAD *=/s/@LIB_PTHREAD@//
-/^LIBTIFF *=/s/@LIBTIFF@//
-/^LIBJPEG *=/s/@LIBJPEG@//
-/^LIBPNG *=/s/@LIBPNG@//
-/^LIBGIF *=/s/@LIBGIF@//
-/^LIBXPM *=/s/@LIBXPM@//
+s/ address@hidden@//
+s/ address@hidden@//
+s/ address@hidden@//
+s/ address@hidden@//
+s/ address@hidden@//
 /^XFT_LIBS *=/s/@XFT_LIBS@//
 /^FONTCONFIG_CFLAGS *=/s/@FONTCONFIG_CFLAGS@//
 /^FONTCONFIG_LIBS *=/s/@FONTCONFIG_LIBS@//
@@ -95,10 +95,8 @@
 /^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@//
 /^WIDGET_OBJ *=/s/@WIDGET_OBJ@//
 /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
+/^WINDOW_SYSTEM_OBJ *=/s/@WINDOW_SYSTEM_OBJ@//
 /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/
-/^ns_appdir *=/s/@ns_appdir@//
-/^ns_appbindir *=/s/@ns_appbindir@//
-/^ns_appsrc *=/s/@ns_appsrc@//
 /^NS_OBJ *=/s/@NS_OBJ@//
 /^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@//
 /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@//
@@ -107,6 +105,7 @@
 /^LIB_PTHREAD_SIGMASK *=/s/@address@hidden@//
 /^LIB_CLOCK_GETTIME *=/s/@address@hidden@//g
 /^LIB_TIMER_TIME *=/s/@address@hidden@//g
+/^LIB_EXECINFO *=/s/@address@hidden@//g
 /^LIBGNUTLS_LIBS *=/s/@address@hidden@//
 /^LIBGNUTLS_CFLAGS *=/s/@address@hidden@//
 /^GETLOADAVG_LIBS *=/s/@address@hidden@//
@@ -143,7 +142,7 @@
 /^      *test "X\$(PAXCTL)" = X/d
 /^      *test "\$(CANNOT_DUMP)" = "yes"/d
 /^     if test "\$(CANNOT_DUMP)" =/,/^ else /d
-/^     -\{0,1\} *ln -/s/bootstrap-emacs\$(EXEEXT).*$/bootstrap-emacs$(EXEEXT)/
+/^     -\{0,1\} *ln /s/bootstrap-emacs\$(EXEEXT).*$/bootstrap-emacs$(EXEEXT)/
 /^     fi/d
 /^      *LC_ALL=C \$(RUN_TEMACS)/i\
        stubedit temacs.exe minstack=1024k
@@ -170,7 +169,7 @@
 /^     #/d
 /^     cd.*make-docfile/s!$!; cd ../src!
 /^     @: /d
-/^     -\{0,1\} *ln -/s/ln -f/cp -pf/
+/^     -\{0,1\} *ln /s/ln /cp /
 /^[    ]touch /s/touch/djecho $@ >/
 s/@YMF_PASS_LDFLAGS@/flags/
 s/@lisp_frag@//

=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp  2012-08-28 16:01:59 +0000
+++ b/msdos/sed2v2.inp  2012-11-03 13:48:33 +0000
@@ -30,26 +30,25 @@
 #ifndef MSDOS\
 #define MSDOS\
 #endif
+/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2012 Free 
Software Foundation, Inc."/
+/^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'!
 /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/
 /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/
 /^#undef HAVE_ALLOCA *$/s/^.*$/#define HAVE_ALLOCA 1/
-/^#undef HAVE_INVERSE_HYPERBOLIC *$/s/^.*$/#define HAVE_INVERSE_HYPERBOLIC/
 /^#undef HAVE_SETITIMER *$/s/^.*$/#define HAVE_SETITIMER 1/
 /^#undef HAVE_STRUCT_UTIMBUF *$/s/^.*$/#define HAVE_STRUCT_UTIMBUF 1/
 /^#undef LOCALTIME_CACHE *$/s/^.*$/#define LOCALTIME_CACHE 1/
 /^#undef HAVE_TZSET *$/s/^.*$/#define HAVE_TZSET 1/
-/^#undef HAVE_LOGB *$/s/^.*$/#define HAVE_LOGB 1/
-/^#undef HAVE_FREXP *$/s/^.*$/#define HAVE_FREXP 1/
-/^#undef HAVE_FMOD *$/s/^.*$/#define HAVE_FMOD 1/
 /^#undef HAVE_RINT *$/s/^.*$/#define HAVE_RINT 1/
 /^#undef HAVE_C99_STRTOLD *$/s/^.*$/#define HAVE_C99_STRTOLD 1/
-/^#undef HAVE_CBRT *$/s/^.*$/#define HAVE_CBRT 1/
 /^#undef HAVE_DIFFTIME *$/s/^.*$/#define HAVE_DIFFTIME 1/
 /^#undef HAVE_FPATHCONF *$/s/^.*$/#define HAVE_FPATHCONF 1/
 /^#undef HAVE_MEMSET *$/s/^.*$/#define HAVE_MEMSET 1/
 /^#undef HAVE_MEMCMP *$/s/^.*$/#define HAVE_MEMCMP 1/
 /^#undef HAVE_MEMMOVE *$/s/^.*$/#define HAVE_MEMMOVE 1/
+/^#undef HAVE_SETPGID *$/s/^.*$/#define HAVE_SETPGID 1/
 /^#undef HAVE_SETRLIMIT *$/s/^.*$/#define HAVE_SETRLIMIT 1/
+/^#undef HAVE_SIGSETJMP *$/s/^.*$/#define HAVE_SIGSETJMP 1/
 /^#undef HAVE_GETRUSAGE *$/s/^.*$/#define HAVE_GETRUSAGE 1/
 /^#undef GETTIMEOFDAY_TIMEZONE *$/s/^.*$/#define GETTIMEOFDAY_TIMEZONE struct 
timezone/
 /^#undef HAVE_TM_GMTOFF *$/s/^.*$/#define HAVE_TM_GMTOFF 1/
@@ -70,6 +69,7 @@
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
 /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
+/^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) 
((FILE)->_ptr - (FILE)->_base)/
 /^#undef VERSION/s/^.*$/#define VERSION "24.2.50"/
 /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
@@ -95,8 +95,6 @@
 /^#undef NULL_DEVICE *$/s/^.*$/#define NULL_DEVICE "nul"/
 /^#undef SEPCHAR *$/s/^.*$/#define SEPCHAR '\;'/
 /^#undef USER_FULL_NAME *$/s/^.*$/#define USER_FULL_NAME (getenv ("NAME"))/
-/^#undef _setjmp/s/^.*$/#define _setjmp setjmp/
-/^#undef _longjmp/s/^.*$/#define _longjmp longjmp/
 /^#undef inline/s/^.*$/#define inline __inline__/
 /^#undef my_strftime/s/^.*$/#define my_strftime nstrftime/
 /^#undef restrict/s/^.*$/#define restrict __restrict/

=== modified file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp        2012-10-04 07:15:42 +0000
+++ b/msdos/sedlibmk.inp        2012-11-03 13:48:33 +0000
@@ -141,6 +141,7 @@
 /^DEPFLAGS *=/s/@address@hidden@/-MMD -MF ${DEPDIR}\/$*.d/
 /^ECHO_N *=/s/@address@hidden@/-n/
 /^EXEEXT *=/s/@address@hidden@/.exe/
+/^EXECINFO_H *=/s/@address@hidden@/execinfo.h/
 /^GETOPT_H *=/s/@address@hidden@/getopt.h/
 #
 # Gnulib stuff
@@ -165,7 +166,7 @@
 /^GNULIB_DUP *=/s/@GNULIB_DUP@/0/
 /^GNULIB_DUP2 *=/s/@GNULIB_DUP2@/0/
 /^GNULIB_DUP3 *=/s/@GNULIB_DUP3@/1/
-/^GNULIB_ENVIRON *=/s/@GNULIB_ENVIRON@/0/
+/^GNULIB_ENVIRON *=/s/@GNULIB_ENVIRON@/1/
 /^GNULIB_EUIDACCESS *=/s/@GNULIB_EUIDACCESS@/0/
 /^GNULIB_FACCESSAT *=/s/@GNULIB_FACCESSAT@/0/
 /^GNULIB_FCHDIR *=/s/@GNULIB_FCHDIR@/0/
@@ -319,7 +320,7 @@
 /^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/
 /^HAVE_CANONICALIZE_FILE_NAME *=/s/@HAVE_CANONICALIZE_FILE_NAME@/0/
 /^HAVE_CHOWN *=/s/@HAVE_CHOWN@/1/
-/^HAVE_DECL_ENVIRON *=/s/@HAVE_DECL_ENVIRON@/1/
+/^HAVE_DECL_ENVIRON *=/s/@HAVE_DECL_ENVIRON@/0/
 /^HAVE_DECL_FCHDIR *=/s/@HAVE_DECL_FCHDIR@/0/
 /^HAVE_DECL_FDATASYNC *=/s/@HAVE_DECL_FDATASYNC@/0/
 /^HAVE_DECL_FPURGE *=/s/@HAVE_DECL_FPURGE@//
@@ -540,6 +541,7 @@
 /^REPLACE_PREAD *=/s/@REPLACE_PREAD@/0/
 /^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/
 /^REPLACE_PTHREAD_SIGMASK *=/s/@REPLACE_PTHREAD_SIGMASK@/0/
+/^REPLACE_PTSNAME *=/s/@REPLACE_PTSNAME@/0/
 /^REPLACE_PSELECT *=/s/@REPLACE_PSELECT@/0/
 /^REPLACE_PTSNAME *=/s/@REPLACE_PTSNAME@/0/
 /^REPLACE_PTSNAME_R *=/s/@REPLACE_PTSNAME_R@/0/
@@ -646,6 +648,8 @@
 # Fix the recipes for header files
 s/address@hidden@//
 s/address@hidden@/\#/
+s/address@hidden@//
+s/address@hidden@/\#/
 s/address@hidden@/\#/
 s/address@hidden@//
 s/address@hidden@//

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-03 11:33:28 +0000
+++ b/src/ChangeLog     2012-11-03 13:58:33 +0000
@@ -1,3 +1,21 @@
+2012-11-03  Eli Zaretskii  <address@hidden>
+
+       * lisp.mk: Adjust comments to the fact that term/internal is now
+       loaded from loadup.el.
+
+       * msdos.c (msdos_abort): Rename from emacs_abort, and make static.
+       (msdos_fatal_signal): New function.
+       (XMenuActivate): Adjust the call to kbd_buffer_events_waiting to
+       its argument list.
+
+       * conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Define to "inline"
+       for GCC versions before 4.
+       (emacs_raise): Define to call msdos_fatal_signal.
+
+       * xdisp.c (init_from_display_pos): Fix initialization of the bidi
+       iterator when starting in the middle of a display or overlay
+       string.  (Bug#12745)
+
 2012-11-03  Jan Djärv  <address@hidden>
 
        * widget.c (resize_cb): New function.
@@ -5,12 +23,6 @@
        (EmacsFrameResize): Check if all is up to date before changing frame
        size.
 
-2012-11-03  Eli Zaretskii  <address@hidden>
-
-       * xdisp.c (init_from_display_pos): Fix initialization of the bidi
-       iterator when starting in the middle of a display or overlay
-       string.  (Bug#12745)
-
 2012-11-01  Eli Zaretskii  <address@hidden>
 
        * w32proc.c (getpgrp, setpgid): New functions.  (Bug#12776)

=== modified file 'src/conf_post.h'
--- a/src/conf_post.h   2012-10-31 17:27:29 +0000
+++ b/src/conf_post.h   2012-11-03 13:48:33 +0000
@@ -110,8 +110,17 @@
 #else
 # define lstat stat
 #endif
+/* The "portable" definition of _GL_INLINE on config.h does not work
+   with DJGPP GCC 3.4.4: it causes unresolved externals in sysdep.c,
+   although lib/execinfo.h is included and the inline functions there
+   are visible.  */
+#if __GNUC__ < 4
+# define _GL_EXECINFO_INLINE inline
+#endif
 /* End of gnulib-related stuff.  */
 
+#define emacs_raise(sig) msdos_fatal_signal (sig)
+
 #ifndef HAVE_SETPGID
 # ifdef USG
 #  define setpgid(pid, pgid) setpgrp ()

=== modified file 'src/lisp.mk'
--- a/src/lisp.mk       2012-10-21 01:19:46 +0000
+++ b/src/lisp.mk       2012-11-03 13:56:02 +0000
@@ -34,9 +34,9 @@
 ## that does not have an explicit .el extension, but beware of any
 ## no-byte-compile ones.
 
-## Confusingly, term/internal is not in loadup, but is unconditionally
-## loaded by pc-win, which is.  Ditto for international/cp51932 and
-## international/eucjp-ms, loaded from language/japanese.
+## Confusingly, international/cp51932 and international/eucjp-ms are
+## unconditionally loaded from language/japanese, instead of being
+## loaded directly from loadup.el; FIXME.
 
 ## Note that this list should not include lisp files which might not
 ## be present, like site-load.el and site-init.el; this makefile

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2012-09-23 08:44:20 +0000
+++ b/src/msdos.c       2012-11-03 13:48:33 +0000
@@ -3305,7 +3305,7 @@
      Emacs will process them after we return and surprise the user.  */
   discard_mouse_events ();
   mouse_clear_clicks ();
-  if (!kbd_buffer_events_waiting (1))
+  if (!kbd_buffer_events_waiting ())
     clear_input_pending ();
   /* Allow mouse events generation by dos_rawgetc.  */
   mouse_preempted--;
@@ -4214,8 +4214,8 @@
 }
 #endif
 
-void
-emacs_abort (void)
+static void
+msdos_abort (void)
 {
   dos_ttcooked ();
   ScreenSetCursor (10, 0);
@@ -4233,6 +4233,15 @@
 }
 
 void
+msdos_fatal_signal (int sig)
+{
+  if (sig == SIGABRT)
+    msdos_abort ();
+  else
+    raise (sig);
+}
+
+void
 syms_of_msdos (void)
 {
   recent_doskeys = Fmake_vector (make_number (NUM_RECENT_DOSKEYS), Qnil);