* buffer.h (PTR_BYTE_POS, BUF_PTR_BYTE_POS): Remove harmful cast.

The cast incorrectly truncated 64-bit byte offsets to 32 bits, and
isn't needed on 32-bit machines.

diff --git a/src/ChangeLog b/src/ChangeLog
index f4de3d991d9cd9e797c73f30b807c6b66bfcd18e..1222c04d0912f593f8b1c126194e7deef2c6e74f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,7 +5,9 @@
 
        * xfns.c (x_set_scroll_bar_default_width): Remove unused 'int' locals.
 
-       * buffer.h (PTR_BYTE_POS): Don't assume a byte count fits in 'unsigned'.
+       * buffer.h (PTR_BYTE_POS, BUF_PTR_BYTE_POS): Remove harmful cast.
+       The cast incorrectly truncated 64-bit byte offsets to 32 bits, and
+       isn't needed on 32-bit machines.
 
        * buffer.c (Fgenerate_new_buffer_name): Use EMACS_INT for count, not int.
        (advance_to_char_boundary): Return EMACS_INT, not int.

diff --git a/src/buffer.h b/src/buffer.h
index ba48a8105a2b285b2bcf6974825b5e20bfdd1e10..725e4edb6388b569f089303db4b811f42f32ce95 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -337,7 +337,7 @@ while (0)
 
 #define PTR_BYTE_POS(ptr) \
 ((ptr) - (current_buffer)->text->beg                                       \
- - (ptr - (current_buffer)->text->beg <= (size_t) (GPT_BYTE - BEG_BYTE) ? 0 : GAP_SIZE)                                                        \
+ - (ptr - (current_buffer)->text->beg <= GPT_BYTE - BEG_BYTE ? 0 : GAP_SIZE) \
  + BEG_BYTE)
 
 /* Return character at byte position POS.  */
@@ -396,7 +396,7 @@ extern unsigned char *_fetch_multibyte_char_p;
 
 #define BUF_PTR_BYTE_POS(buf, ptr)                             \
 ((ptr) - (buf)->text->beg                                      \
- - (ptr - (buf)->text->beg <= (unsigned) (BUF_GPT_BYTE ((buf)) - BEG_BYTE)\
+ - (ptr - (buf)->text->beg <= BUF_GPT_BYTE (buf) - BEG_BYTE    \
     ? 0 : BUF_GAP_SIZE ((buf)))                                        \
  + BEG_BYTE)