Fix BUF_* macros to handle indirect buffers properly (Bug#8219).

[bpt/emacs.git] / src / lread.c

diff --git a/src/lread.c b/src/lread.c
index 8a5f6ec..3c5b627 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -368,15 +368,15 @@ unreadchar (Lisp_Object readcharfun, int c)
   else if (BUFFERP (readcharfun))
     {
       struct buffer *b = XBUFFER (readcharfun);
+      EMACS_INT charpos = BUF_PT (b);
       EMACS_INT bytepos = BUF_PT_BYTE (b);
 
-      BUF_PT (b)--;
       if (! NILP (BVAR (b, enable_multibyte_characters)))
        BUF_DEC_POS (b, bytepos);
       else
        bytepos--;
 
-      BUF_PT_BYTE (b) = bytepos;
+      SET_BUF_PT_BOTH (b, charpos - 1, bytepos);
     }
   else if (MARKERP (readcharfun))
     {