Mercurial > emacs
comparison src/data.c @ 10645:4eeb2d49d841
(do_symval_forwarding): Use current_perdisplay, not get_perdisplay.
(store_symval_forwarding, find_symbol_value): Likewise.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Fri, 03 Feb 1995 21:04:33 +0000 |
parents | bc37b55fcbb9 |
children | 24958130d147 |
comparison
equal
deleted
inserted
replaced
10644:ce2d2fe2fa79 | 10645:4eeb2d49d841 |
---|---|
642 case Lisp_Misc_Buffer_Objfwd: | 642 case Lisp_Misc_Buffer_Objfwd: |
643 offset = XBUFFER_OBJFWD (valcontents)->offset; | 643 offset = XBUFFER_OBJFWD (valcontents)->offset; |
644 return *(Lisp_Object *)(offset + (char *)current_buffer); | 644 return *(Lisp_Object *)(offset + (char *)current_buffer); |
645 | 645 |
646 case Lisp_Misc_Display_Objfwd: | 646 case Lisp_Misc_Display_Objfwd: |
647 if (!current_perdisplay) | |
648 abort (); | |
647 offset = XDISPLAY_OBJFWD (valcontents)->offset; | 649 offset = XDISPLAY_OBJFWD (valcontents)->offset; |
648 return *(Lisp_Object *)(offset | 650 return *(Lisp_Object *)(offset + (char *)current_perdisplay); |
649 + (char *)get_perdisplay (selected_frame)); | |
650 } | 651 } |
651 return valcontents; | 652 return valcontents; |
652 } | 653 } |
653 | 654 |
654 /* Store NEWVAL into SYM, where VALCONTENTS is found in the value cell | 655 /* Store NEWVAL into SYM, where VALCONTENTS is found in the value cell |
692 *(Lisp_Object *)(offset + (char *)current_buffer) = newval; | 693 *(Lisp_Object *)(offset + (char *)current_buffer) = newval; |
693 } | 694 } |
694 break; | 695 break; |
695 | 696 |
696 case Lisp_Misc_Display_Objfwd: | 697 case Lisp_Misc_Display_Objfwd: |
697 (*(Lisp_Object *)((char *)get_perdisplay (selected_frame) | 698 if (!current_perdisplay) |
699 abort (); | |
700 (*(Lisp_Object *)((char *)current_perdisplay | |
698 + XDISPLAY_OBJFWD (valcontents)->offset)) | 701 + XDISPLAY_OBJFWD (valcontents)->offset)) |
699 = newval; | 702 = newval; |
700 break; | 703 break; |
701 | 704 |
702 default: | 705 default: |
796 case Lisp_Misc_Buffer_Objfwd: | 799 case Lisp_Misc_Buffer_Objfwd: |
797 return *(Lisp_Object *)(XBUFFER_OBJFWD (valcontents)->offset | 800 return *(Lisp_Object *)(XBUFFER_OBJFWD (valcontents)->offset |
798 + (char *)current_buffer); | 801 + (char *)current_buffer); |
799 | 802 |
800 case Lisp_Misc_Display_Objfwd: | 803 case Lisp_Misc_Display_Objfwd: |
804 if (!current_perdisplay) | |
805 abort (); | |
801 return *(Lisp_Object *)(XDISPLAY_OBJFWD (valcontents)->offset | 806 return *(Lisp_Object *)(XDISPLAY_OBJFWD (valcontents)->offset |
802 + (char *)get_perdisplay (selected_frame)); | 807 + (char *)current_perdisplay); |
803 } | 808 } |
804 } | 809 } |
805 | 810 |
806 return valcontents; | 811 return valcontents; |
807 } | 812 } |