comparison src/fileio.c @ 38367:bcff6c46ee05

(unwind_read): Print a message when discarding inserted text or switching the buffer to unibyte. Change parameter. (Finsert_file_contents): Don't pass VISIT to unwind_read.

38366:cb65022a3abb

}


/* Unwind-function for reading from a file in insert-file-contents.

   INFO is a pair (INSERTED-BYTES . VISIT).  INSERTED-BYTES is the
   number of bytes successfully inserted into current_buffer.  VISIT
   is the same as the parameter VISIT Of insert-file-contents.

   When reading is interrupted by C-g, this leaves the newly read part
   of the current buffer undecoded.  If this happens in a multibyte
   buffer, prevent invalid characters by either discarding what has
   been read or switching the buffer to unibyte.

   +-----------------------------------------------------+
           \                             /
	    +--------- the gap ---------+	 */

static Lisp_Object
unwind_read (info)
     Lisp_Object info;
{
  if (!NILP (current_buffer->enable_multibyte_characters))
    {
      int nbytes = XINT (XCAR (info));
      int visit = !NILP (XCDR (info));

      if (visit || Z == nbytes)
	current_buffer->enable_multibyte_characters = Qnil;
      else
	{
	  ZV -= nbytes;
	  ZV_BYTE -= nbytes;
	  Z -= nbytes;
	  Z_BYTE -= nbytes;
      
	  GPT = PT;
	  GPT_BYTE = PT_BYTE;
	  GAP_SIZE = nbytes + GAP_SIZE;
	}
    }
      
  return Qnil;
}

	make_gap (total - GAP_SIZE);

      /* Allow quitting out of the actual I/O.  If a C-g interrupts
	 this, make sure that no invalid characters remain
	 in the undecoded part read.  */
      record_unwind_protect (unwind_read,
			     Fcons (make_number (inserted), visit));
      immediate_quit = 1;
      QUIT;
      this = emacs_read (fd, BYTE_POS_ADDR (PT_BYTE + inserted - 1) + 1,
			 trytry);
      immediate_quit = 0;

38367:bcff6c46ee05

}


/* Unwind-function for reading from a file in insert-file-contents.

   INSERTED_BYTES is the number of bytes successfully inserted into
   current_buffer.

   When reading is interrupted by C-g, this leaves the newly read part
   of the current buffer undecoded.  If this happens in a multibyte
   buffer, prevent invalid characters by either discarding what has
   been read or switching the buffer to unibyte.

   +-----------------------------------------------------+
           \                             /
	    +--------- the gap ---------+	 */

static Lisp_Object
unwind_read (inserted_bytes)
     Lisp_Object inserted_bytes;
{
  if (!NILP (current_buffer->enable_multibyte_characters))
    {
      int nbytes = XINT (inserted_bytes);
      Lisp_Object args[3];
      char *action;

      if (Z == nbytes)
	{
	  /* Buffer was previously empty.  Switch it to unibyte
	     because newly inserted text is not decoded.  */
	  current_buffer->enable_multibyte_characters = Qnil;
	  action = "buffer made unibyte";
	}
      else
	{
	  ZV -= nbytes;
	  ZV_BYTE -= nbytes;
	  Z -= nbytes;
	  Z_BYTE -= nbytes;
      
	  GPT = PT;
	  GPT_BYTE = PT_BYTE;
	  GAP_SIZE = nbytes + GAP_SIZE;
	  
	  action = "no text inserted";
	}

      
      args[0] = build_string ("Quit while inserting text in buffer `%s': %s");
      args[1] = current_buffer->name;
      args[2] = build_string (action);
      Fmessage (3, args);
    }
      
  return Qnil;
}

	make_gap (total - GAP_SIZE);

      /* Allow quitting out of the actual I/O.  If a C-g interrupts
	 this, make sure that no invalid characters remain
	 in the undecoded part read.  */
      record_unwind_protect (unwind_read, make_number (inserted));
      immediate_quit = 1;
      QUIT;
      this = emacs_read (fd, BYTE_POS_ADDR (PT_BYTE + inserted - 1) + 1,
			 trytry);
      immediate_quit = 0;