(display_mode_line): Rename perdisplay to kboard.

diff --git a/src/xdisp.c b/src/xdisp.c
index 4fa1c4a909ff386cbb1299b0719c820fe2d6d33e..e6b4021e1fdc45daf8135fbdd93550e9fa5b848b 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2966,18 +2966,18 @@ display_mode_line (w)
   w->column_number_displayed = Qnil;
 
   get_display_line (f, vpos, left);
-#ifdef MULTI_PERDISPLAY
+#ifdef MULTI_KBOARD
   {
-    /* Sigh, mode-line-format can reference display-local variables like
+    /* Sigh, mode-line-format can reference kboard-local variables like
        defining-kbd-macro.  Use the one associated with the frame we're
        updating.  */
-    PERDISPLAY *orig_perdisplay = current_perdisplay;
-    current_perdisplay = get_perdisplay (f);
+    KBOARD *orig_kboard = current_kboard;
+    current_kboard = FRAME_KBOARD (f);
 #endif
     display_mode_element (w, vpos, left, 0, right, right,
                          current_buffer->mode_line_format);
-#ifdef MULTI_PERDISPLAY
-    current_perdisplay = orig_perdisplay;
+#ifdef MULTI_KBOARD
+    current_kboard = orig_kboard;
   }
 #endif
   FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0;