diff options
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/alloc.c b/src/alloc.c index c3f7920ed87..7baaa512c20 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -3884,15 +3884,6 @@ build_marker (struct buffer *buf, ptrdiff_t charpos, ptrdiff_t bytepos) | |||
| 3884 | return obj; | 3884 | return obj; |
| 3885 | } | 3885 | } |
| 3886 | 3886 | ||
| 3887 | /* Put MARKER back on the free list after using it temporarily. */ | ||
| 3888 | |||
| 3889 | void | ||
| 3890 | free_marker (Lisp_Object marker) | ||
| 3891 | { | ||
| 3892 | unchain_marker (XMARKER (marker)); | ||
| 3893 | free_misc (marker); | ||
| 3894 | } | ||
| 3895 | |||
| 3896 | 3887 | ||
| 3897 | /* Return a newly created vector or string with specified arguments as | 3888 | /* Return a newly created vector or string with specified arguments as |
| 3898 | elements. If all the arguments are characters that can fit | 3889 | elements. If all the arguments are characters that can fit |
| @@ -6343,12 +6334,8 @@ mark_localized_symbol (struct Lisp_Symbol *ptr) | |||
| 6343 | { | 6334 | { |
| 6344 | struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (ptr); | 6335 | struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (ptr); |
| 6345 | Lisp_Object where = blv->where; | 6336 | Lisp_Object where = blv->where; |
| 6346 | /* If the value is set up for a killed buffer or deleted | 6337 | /* If the value is set up for a killed buffer restore its global binding. */ |
| 6347 | frame, restore its global binding. If the value is | 6338 | if ((BUFFERP (where) && !BUFFER_LIVE_P (XBUFFER (where)))) |
| 6348 | forwarded to a C variable, either it's not a Lisp_Object | ||
| 6349 | var, or it's staticpro'd already. */ | ||
| 6350 | if ((BUFFERP (where) && !BUFFER_LIVE_P (XBUFFER (where))) | ||
| 6351 | || (FRAMEP (where) && !FRAME_LIVE_P (XFRAME (where)))) | ||
| 6352 | swap_in_global_binding (ptr); | 6339 | swap_in_global_binding (ptr); |
| 6353 | mark_object (blv->where); | 6340 | mark_object (blv->where); |
| 6354 | mark_object (blv->valcell); | 6341 | mark_object (blv->valcell); |