comparison src/lread.c @ 20566:0877f6e6fc15

(readchar): Use marker's bytepos instead of bufpos.

20565:aa9b7c5f0f62

	  int orig_bytepos = bytepos;

	  if (bytepos >= BUF_ZV_BYTE (inbuffer))
	    return -1;

	  if (XMARKER (readcharfun)->bufpos == BUF_GPT_BYTE (inbuffer))
	    XMARKER (readcharfun)->bufpos += BUF_GAP_SIZE (inbuffer);

	  if (! NILP (inbuffer->enable_multibyte_characters))
	    INC_POS (bytepos);
	  else
	    bytepos++;
	  XMARKER (readcharfun)->bufpos += bytepos - orig_bytepos;
	  XMARKER (readcharfun)->charpos++;

	  readchar_backlog = bytepos - orig_bytepos;
	}

      /* Because we move ->bufpos across the gap before we advance it,
	 the gap never comes between the previous character and ->bufpos.  */
      return *(BUF_BEG_ADDR (inbuffer) + XMARKER (readcharfun)->bufpos
	       - readchar_backlog--);
    }
  if (EQ (readcharfun, Qget_file_char))
    {
      c = getc (instream);

20566:0877f6e6fc15

	  int orig_bytepos = bytepos;

	  if (bytepos >= BUF_ZV_BYTE (inbuffer))
	    return -1;

	  if (! NILP (inbuffer->enable_multibyte_characters))
	    INC_POS (bytepos);
	  else
	    bytepos++;
	  XMARKER (readcharfun)->bytepos = bytepos;
	  XMARKER (readcharfun)->charpos++;

	  readchar_backlog = bytepos - orig_bytepos;
	}

      return *(BUF_BEG_ADDR (inbuffer) + XMARKER (readcharfun)->bytepos
	       - readchar_backlog--);
    }
  if (EQ (readcharfun, Qget_file_char))
    {
      c = getc (instream);