comparison src/data.c @ 10645:4eeb2d49d841

(do_symval_forwarding): Use current_perdisplay, not get_perdisplay. (store_symval_forwarding, find_symbol_value): Likewise.

10644:ce2d2fe2fa79

      case Lisp_Misc_Buffer_Objfwd:
	offset = XBUFFER_OBJFWD (valcontents)->offset;
	return *(Lisp_Object *)(offset + (char *)current_buffer);

      case Lisp_Misc_Display_Objfwd:
	offset = XDISPLAY_OBJFWD (valcontents)->offset;
	return *(Lisp_Object *)(offset
				+ (char *)get_perdisplay (selected_frame));
      }
  return valcontents;
}

/* Store NEWVAL into SYM, where VALCONTENTS is found in the value cell

	    *(Lisp_Object *)(offset + (char *)current_buffer) = newval;
	  }
	  break;

	case Lisp_Misc_Display_Objfwd:
	  (*(Lisp_Object *)((char *)get_perdisplay (selected_frame)
			    + XDISPLAY_OBJFWD (valcontents)->offset))
	    = newval;
	  break;

	default:

	case Lisp_Misc_Buffer_Objfwd:
	  return *(Lisp_Object *)(XBUFFER_OBJFWD (valcontents)->offset
				  + (char *)current_buffer);

	case Lisp_Misc_Display_Objfwd:
	  return *(Lisp_Object *)(XDISPLAY_OBJFWD (valcontents)->offset
				  + (char *)get_perdisplay (selected_frame));
	}
    }

  return valcontents;
}

10645:4eeb2d49d841

      case Lisp_Misc_Buffer_Objfwd:
	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);
      }
  return valcontents;
}

/* Store NEWVAL into SYM, where VALCONTENTS is found in the value cell

	    *(Lisp_Object *)(offset + (char *)current_buffer) = newval;
	  }
	  break;

	case Lisp_Misc_Display_Objfwd:
	  if (!current_perdisplay)
	    abort ();
	  (*(Lisp_Object *)((char *)current_perdisplay
			    + XDISPLAY_OBJFWD (valcontents)->offset))
	    = newval;
	  break;

	default:

	case Lisp_Misc_Buffer_Objfwd:
	  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);
	}
    }

  return valcontents;
}