* fileio.c (Finsert_file_contents):

* lread.c (Feval_buffer): Use BUF_TEMP_SET_PT.
* buffer.h (BUF_SET_PT): Remove.  set_point_both doesn't work right
when buffer != current_buffer anyway.

diff --git a/src/ChangeLog b/src/ChangeLog
index 59904d091593eb09d1eaf09c1335316314420295..8d077381c8da13274a05e30a67bd9240fe8c3e4a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * fileio.c (Finsert_file_contents):
+       * lread.c (Feval_buffer): Use BUF_TEMP_SET_PT.
+       * buffer.h (BUF_SET_PT): Remove.  set_point_both doesn't work right
+       when buffer != current_buffer anyway.
+
 2008-03-20  Andreas Schwab  <schwab@suse.de>
 
        * callint.c (Fcall_interactively) [case 'B']: Use other-buffer

diff --git a/src/buffer.h b/src/buffer.h
index 5c2dd5bc143d3b6b55456f936c072c6c0c4eea9a..eb1f0a71686e4027a1fd3e5a6d3cda6dcf2ab7a6 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -216,8 +216,6 @@ Boston, MA 02110-1301, USA.  */
 #define TEMP_SET_PT_BOTH(position, byte) \
   (temp_set_point_both (current_buffer, (position), (byte)))
 
-#define BUF_SET_PT(buffer, position) \
-  (set_point ((buffer), (position)))
 #define BUF_TEMP_SET_PT(buffer, position) \
   (temp_set_point ((buffer), (position)))
 

diff --git a/src/fileio.c b/src/fileio.c
index f478b4a1fada0ba5e3ced3e9bd2d0e53e49f574d..fe05cf9d441b97bff5ab0b05f96804691267ac61 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4237,8 +4237,8 @@ variable `last-coding-system-used' to the coding system actually used.  */)
 
          how_much += this;
 
-         BUF_SET_PT (XBUFFER (conversion_buffer),
-                     BUF_Z (XBUFFER (conversion_buffer)));
+         BUF_TEMP_SET_PT (XBUFFER (conversion_buffer),
+                          BUF_Z (XBUFFER (conversion_buffer)));
          decode_coding_c_string (&coding, read_buf, unprocessed + this,
                                  conversion_buffer);
          unprocessed = coding.carryover_bytes;

diff --git a/src/lread.c b/src/lread.c
index c1ee53056aceee2d39e26290e3dc76f4bd262227..77c7a3c875fd66995d7d3ef36ac7fb039614d57a 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -1850,7 +1850,7 @@ This function preserves the position of point.  */)
   specbind (Qeval_buffer_list, Fcons (buf, Veval_buffer_list));
   specbind (Qstandard_output, tem);
   record_unwind_protect (save_excursion_restore, save_excursion_save ());
-  BUF_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf)));
+  BUF_TEMP_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf)));
   readevalloop (buf, 0, filename, Feval,
                !NILP (printflag), unibyte, Qnil, Qnil, Qnil);
   unbind_to (count, Qnil);