From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 9 May 1991 03:49:40 +0000 (+0000)
Subject: Change X-WINDOW-GET-DEFAULT to X-DISPLAY-GET-DEFAULT.
X-Git-Tag: 20090517-FFI~10624
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=bebd813d6dc7d38f936a85cd23a87dfa857732f8;p=mit-scheme.git

Change X-WINDOW-GET-DEFAULT to X-DISPLAY-GET-DEFAULT.
---

diff --git a/v7/src/microcode/version.h b/v7/src/microcode/version.h
index 7fdc281ad..364448268 100644
--- a/v7/src/microcode/version.h
+++ b/v7/src/microcode/version.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/version.h,v 11.78 1991/05/06 18:09:37 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/version.h,v 11.79 1991/05/09 03:49:40 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -46,5 +46,5 @@ MIT in each case. */
 #define VERSION		11
 #endif
 #ifndef SUBVERSION
-#define SUBVERSION	78
+#define SUBVERSION	79
 #endif
diff --git a/v7/src/microcode/x11base.c b/v7/src/microcode/x11base.c
index 44558f1ed..ee18e18df 100644
--- a/v7/src/microcode/x11base.c
+++ b/v7/src/microcode/x11base.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11base.c,v 1.20 1991/04/26 18:30:09 markf Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11base.c,v 1.21 1991/05/09 03:49:05 cph Exp $
 
 Copyright (c) 1989-91 Massachusetts Institute of Technology
 
@@ -964,13 +964,13 @@ DEFINE_PRIMITIVE ("X-DISPLAY-SYNC", Prim_x_display_sync, 2, 2, 0)
   PRIMITIVE_RETURN (UNSPECIFIC);
 }
 
-DEFINE_PRIMITIVE ("X-WINDOW-GET-DEFAULT", Prim_x_window_get_default, 3, 3, 0)
+DEFINE_PRIMITIVE ("X-DISPLAY-GET-DEFAULT", Prim_x_display_get_default, 3, 3, 0)
 {
   PRIMITIVE_HEADER (3);
   {
     char * result =
       (XGetDefault
-       ((XW_DISPLAY (x_window_arg (1))), (STRING_ARG (2)), (STRING_ARG (3))));
+       ((XD_DISPLAY (x_display_arg (1))), (STRING_ARG (2)), (STRING_ARG (3))));
     PRIMITIVE_RETURN
       ((result == 0) ? SHARP_F : (char_pointer_to_string (result)));
   }
diff --git a/v7/src/runtime/x11graph.scm b/v7/src/runtime/x11graph.scm
index dcce9bf02..8c9d242c7 100644
--- a/v7/src/runtime/x11graph.scm
+++ b/v7/src/runtime/x11graph.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/x11graph.scm,v 1.8 1991/04/08 22:20:21 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/x11graph.scm,v 1.9 1991/05/09 03:46:58 cph Exp $
 
 Copyright (c) 1989-91 Massachusetts Institute of Technology
 
@@ -44,6 +44,7 @@ MIT in each case. |#
   (x-close-all-displays 0)
   (x-close-window 1)
   (x-display-flush 1)
+  (x-display-get-default 3)
   (x-display-process-events 2)
   (x-window-x-size 1)
   (x-window-y-size 1)
@@ -52,7 +53,6 @@ MIT in each case. |#
   (x-window-beep 1)
   (x-window-clear 1)
   (x-window-display 1)
-  (x-window-get-default 3)
   (x-window-set-foreground-color 2)
   (x-window-set-background-color 2)
   (x-window-set-border-color 2)
@@ -188,8 +188,8 @@ MIT in each case. |#
 
 (define (operation/get-default device resource-name class-name)
   (x-graphics-device/process-events! device)
-  (x-window-get-default (x-graphics-device/window device)
-			resource-name class-name))
+  (x-display-get-default (x-graphics-device/display device)
+			 resource-name class-name))
 
 (define (operation/map-window device)
   (x-graphics-device/process-events! device)
diff --git a/v8/src/microcode/version.h b/v8/src/microcode/version.h
index 676a955ea..bed9cfc2e 100644
--- a/v8/src/microcode/version.h
+++ b/v8/src/microcode/version.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/version.h,v 11.78 1991/05/06 18:09:37 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/version.h,v 11.79 1991/05/09 03:49:40 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -46,5 +46,5 @@ MIT in each case. */
 #define VERSION		11
 #endif
 #ifndef SUBVERSION
-#define SUBVERSION	78
+#define SUBVERSION	79
 #endif