Commit 31c45e79 authored by Karl Heuer's avatar Karl Heuer

(do_symval_forwarding): Use current_perdisplay, not get_perdisplay.

(store_symval_forwarding, find_symbol_value): Likewise.
parent c04f7d65
...@@ -644,9 +644,10 @@ do_symval_forwarding (valcontents) ...@@ -644,9 +644,10 @@ do_symval_forwarding (valcontents)
return *(Lisp_Object *)(offset + (char *)current_buffer); return *(Lisp_Object *)(offset + (char *)current_buffer);
case Lisp_Misc_Display_Objfwd: case Lisp_Misc_Display_Objfwd:
if (!current_perdisplay)
abort ();
offset = XDISPLAY_OBJFWD (valcontents)->offset; offset = XDISPLAY_OBJFWD (valcontents)->offset;
return *(Lisp_Object *)(offset return *(Lisp_Object *)(offset + (char *)current_perdisplay);
+ (char *)get_perdisplay (selected_frame));
} }
return valcontents; return valcontents;
} }
...@@ -694,7 +695,9 @@ store_symval_forwarding (sym, valcontents, newval) ...@@ -694,7 +695,9 @@ store_symval_forwarding (sym, valcontents, newval)
break; break;
case Lisp_Misc_Display_Objfwd: case Lisp_Misc_Display_Objfwd:
(*(Lisp_Object *)((char *)get_perdisplay (selected_frame) if (!current_perdisplay)
abort ();
(*(Lisp_Object *)((char *)current_perdisplay
+ XDISPLAY_OBJFWD (valcontents)->offset)) + XDISPLAY_OBJFWD (valcontents)->offset))
= newval; = newval;
break; break;
...@@ -798,8 +801,10 @@ find_symbol_value (sym) ...@@ -798,8 +801,10 @@ find_symbol_value (sym)
+ (char *)current_buffer); + (char *)current_buffer);
case Lisp_Misc_Display_Objfwd: case Lisp_Misc_Display_Objfwd:
if (!current_perdisplay)
abort ();
return *(Lisp_Object *)(XDISPLAY_OBJFWD (valcontents)->offset return *(Lisp_Object *)(XDISPLAY_OBJFWD (valcontents)->offset
+ (char *)get_perdisplay (selected_frame)); + (char *)current_perdisplay);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment