Mercurial > emacs
changeset 93110:6d11337f1ad8
* 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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 20 Mar 2008 18:13:12 +0000 |
| parents | 7316c5c792f4 |
| children | f84051049637 |
| files | src/ChangeLog src/buffer.h src/fileio.c src/lread.c |
| diffstat | 4 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Mar 20 17:21:16 2008 +0000 +++ b/src/ChangeLog Thu Mar 20 18:13:12 2008 +0000 @@ -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
--- a/src/buffer.h Thu Mar 20 17:21:16 2008 +0000 +++ b/src/buffer.h Thu Mar 20 18:13:12 2008 +0000 @@ -216,8 +216,6 @@ #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)))
--- a/src/fileio.c Thu Mar 20 17:21:16 2008 +0000 +++ b/src/fileio.c Thu Mar 20 18:13:12 2008 +0000 @@ -4237,8 +4237,8 @@ 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;
--- a/src/lread.c Thu Mar 20 17:21:16 2008 +0000 +++ b/src/lread.c Thu Mar 20 18:13:12 2008 +0000 @@ -1850,7 +1850,7 @@ 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);