summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1995-02-03 21:04:33 +0000
committerKarl Heuer <kwzh@gnu.org>1995-02-03 21:04:33 +0000
commit5edd11ac9b073441decb82a22f449864ba491f98 (patch)
tree5c3912ec61b4fa255240e7eafda773bff1567e12
parentb04e120eadfefcd5cadb113dd062372fbcd5a294 (diff)
downloademacs-5edd11ac9b073441decb82a22f449864ba491f98.tar.gz
(do_symval_forwarding): Use current_perdisplay, not get_perdisplay.
(store_symval_forwarding, find_symbol_value): Likewise.
-rw-r--r--src/data.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/data.c b/src/data.c
index 298c0b646db..efa77a4506b 100644
--- a/src/data.c
+++ b/src/data.c
@@ -644,9 +644,10 @@ do_symval_forwarding (valcontents)
return *(Lisp_Object *)(offset + (char *)current_buffer);
case Lisp_Misc_Display_Objfwd:
+ if (!current_perdisplay)
+ abort ();
offset = XDISPLAY_OBJFWD (valcontents)->offset;
- return *(Lisp_Object *)(offset
- + (char *)get_perdisplay (selected_frame));
+ return *(Lisp_Object *)(offset + (char *)current_perdisplay);
}
return valcontents;
}
@@ -694,7 +695,9 @@ store_symval_forwarding (sym, valcontents, newval)
break;
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))
= newval;
break;
@@ -798,8 +801,10 @@ find_symbol_value (sym)
+ (char *)current_buffer);
case Lisp_Misc_Display_Objfwd:
+ if (!current_perdisplay)
+ abort ();
return *(Lisp_Object *)(XDISPLAY_OBJFWD (valcontents)->offset
- + (char *)get_perdisplay (selected_frame));
+ + (char *)current_perdisplay);
}
}