diff --git a/src/lisp.h b/src/lisp.h
index 7e8b1f62eb4..62d859704a4 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1160,8 +1160,8 @@ extern void defvar_int ();
  defvar_per_buffer (lname, vname, type, 0)
 #define DEFVAR_DISPLAY(lname, vname, doc) \
  defvar_display (lname, \
-		 (int)((char *)(&get_perdisplay (selected_frame)->vname) \
-		       - (char *)get_perdisplay (selected_frame)))
+		 (int)((char *)(&current_perdisplay->vname) \
+		       - (char *)current_perdisplay))
 
 /* Structure for recording Lisp call stack for backtrace purposes.  */