Mercurial > emacs
changeset 11019:48bf6677dab3
(find_symbol_value): current_perdisplay now is never null.
(store_symval_forwarding, do_symval_forwarding): Likewise.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Wed, 15 Mar 1995 01:57:50 +0000 |
| parents | 2d9bdf1ba3d1 |
| children | 0951bb12c8ee |
| files | src/data.c |
| diffstat | 1 files changed, 11 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/data.c Wed Mar 15 01:57:05 1995 +0000 +++ b/src/data.c Wed Mar 15 01:57:50 1995 +0000 @@ -711,11 +711,9 @@ offset = XBUFFER_OBJFWD (valcontents)->offset; 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 *)current_perdisplay); + case Lisp_Misc_Kboard_Objfwd: + offset = XKBOARD_OBJFWD (valcontents)->offset; + return *(Lisp_Object *)(offset + (char *)current_kboard); } return valcontents; } @@ -762,11 +760,9 @@ } break; - case Lisp_Misc_Display_Objfwd: - if (!current_perdisplay) - abort (); - (*(Lisp_Object *)((char *)current_perdisplay - + XDISPLAY_OBJFWD (valcontents)->offset)) + case Lisp_Misc_Kboard_Objfwd: + (*(Lisp_Object *)((char *)current_kboard + + XKBOARD_OBJFWD (valcontents)->offset)) = newval; break; @@ -868,11 +864,9 @@ return *(Lisp_Object *)(XBUFFER_OBJFWD (valcontents)->offset + (char *)current_buffer); - case Lisp_Misc_Display_Objfwd: - if (!current_perdisplay) - abort (); - return *(Lisp_Object *)(XDISPLAY_OBJFWD (valcontents)->offset - + (char *)current_perdisplay); + case Lisp_Misc_Kboard_Objfwd: + return *(Lisp_Object *)(XKBOARD_OBJFWD (valcontents)->offset + + (char *)current_kboard); } } @@ -1191,7 +1185,7 @@ CHECK_SYMBOL (sym, 0); valcontents = XSYMBOL (sym)->value; - if (EQ (sym, Qnil) || EQ (sym, Qt) || DISPLAY_OBJFWDP (valcontents)) + if (EQ (sym, Qnil) || EQ (sym, Qt) || KBOARD_OBJFWDP (valcontents)) error ("Symbol %s may not be buffer-local", XSYMBOL (sym)->name->data); if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents)) @@ -1234,7 +1228,7 @@ CHECK_SYMBOL (sym, 0); valcontents = XSYMBOL (sym)->value; - if (EQ (sym, Qnil) || EQ (sym, Qt) || DISPLAY_OBJFWDP (valcontents)) + if (EQ (sym, Qnil) || EQ (sym, Qt) || KBOARD_OBJFWDP (valcontents)) error ("Symbol %s may not be buffer-local", XSYMBOL (sym)->name->data); if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))