Mercurial > emacs

changeset 12672:63201a2c1247

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do renamings: frame->display => frame->output, struct x_display -> struct x_output.
author Karl Heuer <kwzh@gnu.org>
date Wed, 26 Jul 1995 00:04:12 +0000
parents f6386ce0011c
children 4d6b7909a0ec
files src/widget.c src/xfns.c src/xmenu.c
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/widget.c	Wed Jul 26 00:02:03 1995 +0000
+++ b/src/widget.c	Wed Jul 26 00:04:12 1995 +0000
@@ -630,7 +630,7 @@
 update_various_frame_slots (ew)
      EmacsFrame ew;
 {
-  struct x_display* x = ew->emacs_frame.frame->output_data.x;
+  struct x_output *x = ew->emacs_frame.frame->output_data.x;
   x->pixel_height = ew->core.height;
   x->pixel_width = ew->core.width;
   x->internal_border_width = ew->emacs_frame.internal_border_width;
@@ -641,7 +641,7 @@
 update_from_various_frame_slots (ew)
      EmacsFrame ew;
 {
-  struct x_display* x = ew->emacs_frame.frame->output_data.x;
+  struct x_output *x = ew->emacs_frame.frame->output_data.x;
   ew->core.height = x->pixel_height;
   ew->core.width = x->pixel_width;
   ew->core.background_pixel = x->background_pixel;
--- a/src/xfns.c	Wed Jul 26 00:02:03 1995 +0000
+++ b/src/xfns.c	Wed Jul 26 00:04:12 1995 +0000
@@ -314,7 +314,7 @@
       if (!GC_FRAMEP (frame))
         continue;
       f = XFRAME (frame);
-      if (f->display.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+      if (f->output_data.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
 	continue;
       x = f->output_data.x;
       /* This frame matches if the window is any of its widgets.  */
@@ -346,7 +346,7 @@
       if (!GC_FRAMEP (frame))
         continue;
       f = XFRAME (frame);
-      if (f->display.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+      if (f->output_data.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
 	continue;
       x = f->output_data.x;
       /* This frame matches if the window is any of its widgets.  */
@@ -375,7 +375,7 @@
       if (!GC_FRAMEP (frame))
         continue;
       f = XFRAME (frame);
-      if (f->display.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+      if (f->output_data.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
 	continue;
       x = f->output_data.x;
       /* Match if the window is this frame's menubar.  */
@@ -403,7 +403,7 @@
       if (!GC_FRAMEP (frame))
         continue;
       f = XFRAME (frame);
-      if (f->display.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+      if (f->output_data.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
 	continue;
       x = f->output_data.x;
       /* This frame matches if the window is its topmost widget.  */
--- a/src/xmenu.c	Wed Jul 26 00:02:03 1995 +0000
+++ b/src/xmenu.c	Wed Jul 26 00:04:12 1995 +0000
@@ -184,7 +184,7 @@
       if (!GC_FRAMEP (frame))
         continue;
       f = XFRAME (frame);
-      if (f->display.nothing == 1)
+      if (f->output_data.nothing == 1)
 	continue;
       if (f->output_data.x->id == id)
 	return f;