Merge from trunk.

4 files changed, 48 insertions, 33 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2677f03944f..fe8df6ffe41 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-08-16  Paul Eggert  <eggert@cs.ucla.edu>
+2011-08-18  Paul Eggert  <eggert@cs.ucla.edu>
 
         Integer and memory overflow issues (Bug#9196).
 
@@ -421,6 +421,21 @@
         (gs_load): Use printmax_t to print the widest integers possible.
         Check for integer overflow when computing image height and width.
 
+2011-08-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * eval.c (internal_condition_case, internal_condition_case_1)
+        (internal_condition_case_2, internal_condition_case_n): Remove
+        unnecessary aborts (Bug#9081).
+
+2011-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * lread.c (Fload) [DOS_NT]: If `openp' returns -2, but the file
+        has no `load' handler, try opening the file locally.  (Bug#9311)
+
+2011-08-16  Ken Brown  <kbrown@cornell.edu>
+
+        * gmalloc.c: Expand comment.
+
 2011-08-16  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (set_cursor_from_row): Don't accept a previous candidate
@@ -475,7 +490,7 @@
 2011-08-14  Kenichi Handa  <handa@m17n.org>
 
         * process.c (create_process): Call setup_process_coding_systems
-        after the pid of the process is set to -1.
+        after the pid of the process is set to -1 (Bug#8162).
 
 2011-08-14  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/eval.c b/src/eval.c
index 94039b31e17..8149683a104 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1462,13 +1462,6 @@ internal_condition_case (Lisp_Object (*bfun) (void), Lisp_Object handlers,
   struct catchtag c;
   struct handler h;
 
-  /* Since Fsignal will close off all calls to x_catch_errors,
-     we will get the wrong results if some are not closed now.  */
-#if HAVE_X_WINDOWS
-  if (x_catching_errors ())
-    abort ();
-#endif
-
   c.tag = Qnil;
   c.val = Qnil;
   c.backlist = backtrace_list;
@@ -1507,13 +1500,6 @@ internal_condition_case_1 (Lisp_Object (*bfun) (Lisp_Object), Lisp_Object arg,
   struct catchtag c;
   struct handler h;
 
-  /* Since Fsignal will close off all calls to x_catch_errors,
-     we will get the wrong results if some are not closed now.  */
-#if HAVE_X_WINDOWS
-  if (x_catching_errors ())
-    abort ();
-#endif
-
   c.tag = Qnil;
   c.val = Qnil;
   c.backlist = backtrace_list;
@@ -1556,13 +1542,6 @@ internal_condition_case_2 (Lisp_Object (*bfun) (Lisp_Object, Lisp_Object),
   struct catchtag c;
   struct handler h;
 
-  /* Since Fsignal will close off all calls to x_catch_errors,
-     we will get the wrong results if some are not closed now.  */
-#if HAVE_X_WINDOWS
-  if (x_catching_errors ())
-    abort ();
-#endif
-
   c.tag = Qnil;
   c.val = Qnil;
   c.backlist = backtrace_list;
@@ -1605,13 +1584,6 @@ internal_condition_case_n (Lisp_Object (*bfun) (ptrdiff_t, Lisp_Object *),
   struct catchtag c;
   struct handler h;
 
-  /* Since Fsignal will close off all calls to x_catch_errors,
-     we will get the wrong results if some are not closed now.  */
-#if HAVE_X_WINDOWS
-  if (x_catching_errors ())
-    abort ();
-#endif
-
   c.tag = Qnil;
   c.val = Qnil;
   c.backlist = backtrace_list;
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 61046ad9d1b..d49259b8ed7 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -356,7 +356,11 @@ Fifth Floor, Boston, MA 02110-1301, USA.
    emacs uses the Cygwin heap (managed with sbrk).  When emacs starts
    on Cygwin, it reinitializes malloc, and we save the old info for
    use by free and realloc if they're called with a pointer into the
-   static heap. */
+   static heap.
+
+   Currently (2011-08-16) the Cygwin build doesn't use ralloc.c; if
+   this is changed in the future, we'll have to similarly deal with
+   reinitializing ralloc. */
 #ifdef CYGWIN
 extern __ptr_t bss_sbrk PP ((ptrdiff_t __size));
 extern int bss_sbrk_did_unexec;
diff --git a/src/lread.c b/src/lread.c
index f2a52780a0c..d24da729df6 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1124,6 +1124,22 @@ Return t if the file exists and loads successfully.  */)
         handler = Ffind_file_name_handler (found, Qload);
       if (! NILP (handler))
         return call5 (handler, Qload, found, noerror, nomessage, Qt);
+#ifdef DOS_NT
+      /* Tramp has to deal with semi-broken packages that prepend
+         drive letters to remote files.  For that reason, Tramp
+         catches file operations that test for file existence, which
+         makes openp think X:/foo.elc files are remote.  However,
+         Tramp does not catch `load' operations for such files, so we
+         end up with a nil as the `load' handler above.  If we would
+         continue with fd = -2, we will behave wrongly, and in
+         particular try reading a .elc file in the "rt" mode instead
+         of "rb".  See bug #9311 for the results.  To work around
+         this, we try to open the file locally, and go with that if it
+         succeeds.  */
+      fd = emacs_open (SSDATA (ENCODE_FILE (found)), O_RDONLY, 0);
+      if (fd == -1)
+        fd = -2;
+#endif
     }
 
   /* Check if we're stuck in a recursive load cycle.
@@ -1247,9 +1263,17 @@ Return t if the file exists and loads successfully.  */)
   GCPRO3 (file, found, hist_file_name);
 
 #ifdef WINDOWSNT
-  emacs_close (fd);
   efound = ENCODE_FILE (found);
-  stream = fopen (SSDATA (efound), fmode);
+  /* If we somehow got here with fd == -2, meaning the file is deemed
+     to be remote, don't even try to reopen the file locally; just
+     force a failure instead.  */
+  if (fd >= 0)
+    {
+      emacs_close (fd);
+      stream = fopen (SSDATA (efound), fmode);
+    }
+  else
+    stream = NULL;
 #else  /* not WINDOWSNT */
   stream = fdopen (fd, fmode);
 #endif /* not WINDOWSNT */