Merge remote-tracking branch 'origin/master' into feature/android

4 files changed, 48 insertions, 59 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index c96c2b597bd..c97e78559f1 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -926,7 +926,7 @@ Print the contents of $ as an Emacs Lisp cons.
 end
 
 define nextcons
-  p $.u.cdr
+  p $.u.s.u.cdr
   xcons
 end
 document nextcons
diff --git a/src/comp.c b/src/comp.c
index ba549155925..7d2987605d9 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4991,7 +4991,8 @@ DEFUN ("comp--compile-ctxt-to-file", Fcomp__compile_ctxt_to_file,
       format_string ("%s_libgccjit_repro.c", SSDATA (ebase_name)));
 
   Lisp_Object tmp_file =
-    Fmake_temp_file_internal (base_name, Qnil, build_string (".eln.tmp"), Qnil);
+    Fmake_temp_file_internal (base_name, make_fixnum (0),
+                              build_string (".eln.tmp"), Qnil);
   Lisp_Object encoded_tmp_file = ENCODE_FILE (tmp_file);
 #ifdef WINDOWSNT
   encoded_tmp_file = ansi_encode_filename (encoded_tmp_file);
diff --git a/src/fileio.c b/src/fileio.c
index 71f83ea6daf..375019c6fb6 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3979,8 +3979,6 @@ by calling `format-decode', which see.  */)
   struct timespec mtime;
   int fd;
   ptrdiff_t inserted = 0;
-  ptrdiff_t how_much;
-  off_t beg_offset, end_offset;
   int unprocessed;
   specpdl_ref count = SPECPDL_INDEX ();
   Lisp_Object handler, val, insval, orig_filename, old_undo;
@@ -3993,7 +3991,8 @@ by calling `format-decode', which see.  */)
   bool replace_handled = false;
   bool set_coding_system = false;
   Lisp_Object coding_system;
-  bool read_quit = false;
+  /* Negative if read error, 0 if OK so far, positive if quit.  */
+  ptrdiff_t read_quit = 0;
   /* If the undo log only contains the insertion, there's no point
      keeping it.  It's typically when we first fill a file-buffer.  */
   bool empty_undo_list_p
@@ -4042,6 +4041,17 @@ by calling `format-decode', which see.  */)
       goto handled;
     }
 
+  if (!NILP (visit))
+    {
+      if (!NILP (beg) || !NILP (end))
+        error ("Attempt to visit less than an entire file");
+      if (BEG < Z && NILP (replace))
+        error ("Cannot do file visiting in a non-empty buffer");
+    }
+
+  off_t beg_offset = !NILP (beg) ? file_offset (beg) : 0;
+  off_t end_offset = !NILP (end) ? file_offset (end) : -1;
+
   orig_filename = filename;
   filename = ENCODE_FILE (filename);
 
@@ -4084,7 +4094,6 @@ by calling `format-decode', which see.  */)
   if (!S_ISREG (st.st_mode))
     {
       regular = false;
-      seekable = lseek (fd, 0, SEEK_CUR) < 0;
 
       if (! NILP (visit))
         {
@@ -4092,32 +4101,18 @@ by calling `format-decode', which see.  */)
           goto notfound;
         }
 
-      if (!NILP (beg) && !seekable)
-        xsignal2 (Qfile_error,
-                  build_string ("cannot use a start position in a non-seekable file/device"),
-                  orig_filename);
-
       if (!NILP (replace))
         xsignal2 (Qfile_error,
                   build_string ("not a regular file"), orig_filename);
-    }
 
-  if (!NILP (visit))
-    {
-      if (!NILP (beg) || !NILP (end))
-        error ("Attempt to visit less than an entire file");
-      if (BEG < Z && NILP (replace))
-        error ("Cannot do file visiting in a non-empty buffer");
+      seekable = lseek (fd, 0, SEEK_CUR) < 0;
+      if (!NILP (beg) && !seekable)
+        xsignal2 (Qfile_error,
+                  build_string ("cannot use a start position in a non-seekable file/device"),
+                  orig_filename);
     }
 
-  if (!NILP (beg))
-    beg_offset = file_offset (beg);
-  else
-    beg_offset = 0;
-
-  if (!NILP (end))
-    end_offset = file_offset (end);
-  else
+  if (end_offset < 0)
     {
       if (!regular)
         end_offset = TYPE_MAXIMUM (off_t);
@@ -4178,7 +4173,7 @@ by calling `format-decode', which see.  */)
       else
         {
           /* Don't try looking inside a file for a coding system
-             specification if it is not seekable.  */
+             specification if it is not a regular file.  */
           if (regular && !NILP (Vset_auto_coding_function))
             {
               /* Find a coding system specified in the heading two
@@ -4196,7 +4191,7 @@ by calling `format-decode', which see.  */)
                   if (nread == 1024)
                     {
                       int ntail;
-                      if (lseek (fd, - (1024 * 3), SEEK_END) < 0)
+                      if (lseek (fd, st.st_size - 1024 * 3, SEEK_CUR) < 0)
                         report_file_error ("Setting file position",
                                            orig_filename);
                       ntail = emacs_read_quit (fd, read_buf + nread, 1024 * 3);
@@ -4481,7 +4476,7 @@ by calling `format-decode', which see.  */)
       ptrdiff_t bufpos;
       unsigned char *decoded;
       ptrdiff_t temp;
-      ptrdiff_t this = 0;
+      ptrdiff_t this;
       specpdl_ref this_count = SPECPDL_INDEX ();
       bool multibyte
         = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
@@ -4657,8 +4652,12 @@ by calling `format-decode', which see.  */)
     }
 
   move_gap_both (PT, PT_BYTE);
-  if (GAP_SIZE < total)
-    make_gap (total - GAP_SIZE);
+
+  /* Ensure the gap is at least one byte larger than needed for the
+     estimated file size, so that in the usual case we read to EOF
+     without reallocating.  */
+  if (GAP_SIZE <= total)
+    make_gap (total - GAP_SIZE + 1);
 
   if (beg_offset != 0 || !NILP (replace))
     {
@@ -4666,12 +4665,6 @@ by calling `format-decode', which see.  */)
         report_file_error ("Setting file position", orig_filename);
     }
 
-  /* In the following loop, HOW_MUCH contains the total bytes read so
-     far for a regular file, and not changed for a special file.  But,
-     before exiting the loop, it is set to a negative value if I/O
-     error occurs.  */
-  how_much = 0;
-
   /* Total bytes inserted.  */
   inserted = 0;
 
@@ -4680,23 +4673,26 @@ by calling `format-decode', which see.  */)
   {
     ptrdiff_t gap_size = GAP_SIZE;
 
-    while (how_much < total)
+    while (NILP (end) || inserted < total)
       {
-        /* `try' is reserved in some compilers (Microsoft C).  */
-        ptrdiff_t trytry = min (total - how_much, READ_BUF_SIZE);
         ptrdiff_t this;
 
+        if (gap_size == 0)
+          {
+            /* The size estimate was wrong.  Make the gap 50% larger.  */
+            make_gap (GAP_SIZE >> 1);
+            gap_size = GAP_SIZE - inserted;
+          }
+
+        /* 'try' is reserved in some compilers (Microsoft C).  */
+        ptrdiff_t trytry = min (gap_size, READ_BUF_SIZE);
+        if (!NILP (end))
+          trytry = min (trytry, total - inserted);
+
         if (!seekable && NILP (end))
           {
             Lisp_Object nbytes;
 
-            /* Maybe make more room.  */
-            if (gap_size < trytry)
-              {
-                make_gap (trytry - gap_size);
-                gap_size = GAP_SIZE - inserted;
-              }
-
             /* Read from the file, capturing `quit'.  When an
                error occurs, end the loop, and arrange for a quit
                to be signaled after decoding the text we read.  */
@@ -4707,7 +4703,7 @@ by calling `format-decode', which see.  */)
 
             if (NILP (nbytes))
               {
-                read_quit = true;
+                read_quit = 1;
                 break;
               }
 
@@ -4726,19 +4722,11 @@ by calling `format-decode', which see.  */)
 
         if (this <= 0)
           {
-            how_much = this;
+            read_quit = this;
             break;
           }
 
         gap_size -= this;
-
-        /* For a regular file, where TOTAL is the real size,
-           count HOW_MUCH to compare with it.
-           For a special file, where TOTAL is just a buffer size,
-           so don't bother counting in HOW_MUCH.
-           (INSERTED is where we count the number of characters inserted.)  */
-        if (seekable || !NILP (end))
-          how_much += this;
         inserted += this;
       }
   }
@@ -4759,7 +4747,7 @@ by calling `format-decode', which see.  */)
   emacs_close (fd);
   clear_unwind_protect (fd_index);
 
-  if (how_much < 0)
+  if (read_quit < 0)
     report_file_error ("Read error", orig_filename);
 
  notfound:
diff --git a/src/pdumper.c b/src/pdumper.c
index dbdeae9a799..baa33c4f647 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -2748,7 +2748,7 @@ dump_hash_table (struct dump_context *ctx,
 static dump_off
 dump_buffer (struct dump_context *ctx, const struct buffer *in_buffer)
 {
-#if CHECK_STRUCTS && !defined HASH_buffer_DB34E5D09F
+#if CHECK_STRUCTS && !defined HASH_buffer_85D317CE74
 # error "buffer changed. See CHECK_STRUCTS comment in config.h."
 #endif
   struct buffer munged_buffer = *in_buffer;