diff options
| author | Paul Eggert | 2013-07-18 18:24:35 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-07-18 18:24:35 -0700 |
| commit | 1396ac86dea5fccab800e4b25fdb5319381891eb (patch) | |
| tree | 7f89955a2ab13f3ef4a40f14a48bbcc293c3b179 /src/editfns.c | |
| parent | c7064f05d3d660fbdd9e7a2feb0860b04f46ae0d (diff) | |
| download | emacs-1396ac86dea5fccab800e4b25fdb5319381891eb.tar.gz emacs-1396ac86dea5fccab800e4b25fdb5319381891eb.zip | |
Fix obscure porting bug with varargs functions.
The code assumed that int is treated like ptrdiff_t in a vararg
function, which is not a portable assumption. There was a similar
-- though these days less likely -- porting problem with various
assumptions that pointers of different types all smell the same as
far as vararg functions is conserved. To make this problem less
likely in the future, redo the API to use varargs functions.
* alloc.c (make_save_value): Remove this vararg function.
All uses changed to ...
(make_save_int_int_int, make_save_obj_obj_obj_obj)
(make_save_ptr_int, make_save_funcptr_ptr_obj, make_save_memory):
New functions.
(make_save_ptr): Rename from make_save_pointer, for consistency with
the above. Define only on platforms that need it. All uses changed.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/editfns.c b/src/editfns.c index a4dea203a22..50bde90788d 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -838,9 +838,8 @@ This function does not move point. */) | |||
| 838 | Lisp_Object | 838 | Lisp_Object |
| 839 | save_excursion_save (void) | 839 | save_excursion_save (void) |
| 840 | { | 840 | { |
| 841 | return make_save_value | 841 | return make_save_obj_obj_obj_obj |
| 842 | (SAVE_TYPE_OBJ_OBJ_OBJ_OBJ, | 842 | (Fpoint_marker (), |
| 843 | Fpoint_marker (), | ||
| 844 | /* Do not copy the mark if it points to nowhere. */ | 843 | /* Do not copy the mark if it points to nowhere. */ |
| 845 | (XMARKER (BVAR (current_buffer, mark))->buffer | 844 | (XMARKER (BVAR (current_buffer, mark))->buffer |
| 846 | ? Fcopy_marker (BVAR (current_buffer, mark), Qnil) | 845 | ? Fcopy_marker (BVAR (current_buffer, mark), Qnil) |