comparison src/lread.c @ 20691:cf1919e207ef

(unreadchar): For unreading an ASCII char thru a buffer or marker, really decrement point or the marker position.

20690:a51c71dd5cda

  if (c == -1)
    /* Don't back up the pointer if we're unreading the end-of-input mark,
       since readchar didn't advance it when we read it.  */
    ;
  else if (BUFFERP (readcharfun))
    readchar_backlog++;
  else if (MARKERP (readcharfun))
    readchar_backlog++;
  else if (STRINGP (readcharfun))
    read_from_string_index--;
  else if (EQ (readcharfun, Qget_file_char))
    ungetc (c, instream);
  else

20691:cf1919e207ef

  if (c == -1)
    /* Don't back up the pointer if we're unreading the end-of-input mark,
       since readchar didn't advance it when we read it.  */
    ;
  else if (BUFFERP (readcharfun))
    {
      if (!SINGLE_BYTE_CHAR_P (c))
	readchar_backlog++;
      else
	{
	  struct buffer *b = XBUFFER (readcharfun);
	  int bytepos = BUF_PT_BYTE (b);

	  BUF_PT (b)--;
	  if (! NILP (b->enable_multibyte_characters))
	    BUF_DEC_POS (b, bytepos);
	  else
	    bytepos--;

	  BUF_PT_BYTE (b) = bytepos;
	}
    }
  else if (MARKERP (readcharfun))
    {
      if (!SINGLE_BYTE_CHAR_P (c))
	readchar_backlog++;
      else
	{
	  struct buffer *b = XMARKER (readcharfun)->buffer;
	  int bytepos = XMARKER (readcharfun)->bytepos;

	  XMARKER (readcharfun)->charpos--;
	  if (! NILP (b->enable_multibyte_characters))
	    BUF_DEC_POS (b, bytepos);
	  else
	    bytepos--;

	  XMARKER (readcharfun)->bytepos = bytepos;
	}
    }
  else if (STRINGP (readcharfun))
    read_from_string_index--;
  else if (EQ (readcharfun, Qget_file_char))
    ungetc (c, instream);
  else