Rename x-graphics-set-class-hint to x-window-set-class-hint.

diff --git a/v7/src/microcode/prename.h b/v7/src/microcode/prename.h
index 1aedce227840511b196737474e844aa7089d3f43..3f23b7879a59e8111b2ee25cc922a63ea8da2f51 100644 (file)
--- a/v7/src/microcode/prename.h
+++ b/v7/src/microcode/prename.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/prename.h,v 1.4 1990/06/20 17:41:41 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/prename.h,v 1.5 1991/10/02 21:17:20 jinx Exp $
 
 Copyright (c) 1988, 1990 Massachusetts Institute of Technology
 
@@ -55,7 +55,8 @@ static struct primitive_alias aliases [] =
     { "OPEN-DIRECTORY", "DIRECTORY-OPEN" },
     { "SCREEN-X-SIZE", "TTY-X-SIZE" },
     { "SCREEN-Y-SIZE", "TTY-Y-SIZE" },
-    { "FILE-SYMLINK?", "FILE-SOFT-LINK?" }
+    { "FILE-SYMLINK?", "FILE-SOFT-LINK?" },
+    { "X-GRAPHICS-SET-CLASS-HINT", "X-WINDOW-SET-CLASS-HINT" }
   };
 
-#define N_ALIASES 20
+#define N_ALIASES 21

diff --git a/v7/src/microcode/version.h b/v7/src/microcode/version.h
index f71faa9f7af040ec2fb1f55edf5b2ed586187787..9a8b8fcf4233fd44795b836a29f9cab97bd97ad7 100644 (file)
--- 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.98 1991/09/07 22:48:14 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/version.h,v 11.99 1991/10/02 21:17:49 jinx 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     98
+#define SUBVERSION     99
 #endif

diff --git a/v7/src/microcode/x11base.c b/v7/src/microcode/x11base.c
index 4b79c89479edbf56bba43983b496101390e999ed..704cbbf9440a1863ea18d9f0192550c7688931f8 100644 (file)
--- 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.25 1991/08/06 15:11:28 arthur Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11base.c,v 1.26 1991/10/02 21:17:07 jinx Exp $
 
 Copyright (c) 1989-91 Massachusetts Institute of Technology
 
@@ -1226,7 +1226,7 @@ DEFINE_PRIMITIVE ("X-WINDOW-SET-NAME", Prim_x_window_set_name, 2, 2,
   }
   PRIMITIVE_RETURN (UNSPECIFIC);
 }
-
+\f
 DEFINE_PRIMITIVE ("X-WINDOW-SET-ICON-NAME", Prim_x_window_set_icon_name, 2, 2,
   "Set the icon name of WINDOW to STRING.")
 {
@@ -1237,6 +1237,33 @@ DEFINE_PRIMITIVE ("X-WINDOW-SET-ICON-NAME", Prim_x_window_set_icon_name, 2, 2,
   }
   PRIMITIVE_RETURN (UNSPECIFIC);
 }
+
+DEFINE_PRIMITIVE ("X-WINDOW-SET-CLASS-HINT",
+                 Prim_x_graphics_set_class_hint, 4, 4,
+  "(X-WINDOW-SET-CLASS-HINT DISPLAY WINDOW RESOURCE_CLASS RESOURCE_NAME)\n\
+Set the XA_WM_CLASS property of WINDOW on DISPLAY to RESOURCE_CLASS\n\
+and RESOURCE_NAME.")
+{
+  PRIMITIVE_HEADER (4);
+  {
+    struct xdisplay * xd = (x_display_arg (1));
+    Display * display = (XD_DISPLAY (xd));
+    struct xwindow * xw = (x_window_arg (2));
+    Window window = (XW_WINDOW (xw));
+    XClassHint *class_hint;
+
+    CHECK_ARG (3, STRING_P);
+    CHECK_ARG (4, STRING_P);
+    class_hint = XAllocClassHint ();
+    if (class_hint == NULL)
+      error_external_return ();
+    class_hint->res_class = STRING_ARG (3);
+    class_hint->res_name = STRING_ARG (4);
+    XSetClassHint (display, window, class_hint);
+    XFree ((caddr_t) class_hint);
+  }
+  PRIMITIVE_RETURN (UNSPECIFIC);
+}
 \f
 unsigned int
 DEFUN (allocate_x_image, (image), XImage * image)

diff --git a/v7/src/microcode/x11graph.c b/v7/src/microcode/x11graph.c
index 4af0af73f0b101bad4f6c95dcbf341c53a97e392..82a250864ad9bb8f4d3c845a33a465d49851b801 100644 (file)
--- a/v7/src/microcode/x11graph.c
+++ b/v7/src/microcode/x11graph.c
@@ -1,6 +1,7 @@
+
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11graph.c,v 1.16 1991/07/24 19:42:14 arthur Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11graph.c,v 1.17 1991/10/02 21:16:39 jinx Exp $
 
 Copyright (c) 1989-91 Massachusetts Institute of Technology
 
@@ -366,33 +367,6 @@ If third argument SUPPRESS-MAP? is true, do not map the window immediately.")
     }
   }
 }
-
-DEFINE_PRIMITIVE ("X-GRAPHICS-SET-CLASS-HINT",
-                 Prim_x_graphics_set_class_hint, 4, 4,
-  "(X-GRAPHICS-SET-CLASS-HINT DISPLAY WINDOW RESOURCE_CLASS RESOURCE_NAME)\n\
-Set the XA_WM_CLASS property of WINDOW on DISPLAY to RESOURCE_CLASS\n\
-and RESOURCE_NAME.")
-{
-  PRIMITIVE_HEADER (4);
-  {
-    struct xdisplay * xd = (x_display_arg (1));
-    Display * display = (XD_DISPLAY (xd));
-    struct xwindow * xw = (x_window_arg (2));
-    Window window = (XW_WINDOW (xw));
-    XClassHint *class_hint;
-
-    CHECK_ARG (3, STRING_P);
-    CHECK_ARG (4, STRING_P);
-    class_hint = XAllocClassHint ();
-    if (class_hint == NULL)
-      error_external_return ();
-    class_hint->res_class = STRING_ARG (3);
-    class_hint->res_name = STRING_ARG (4);
-    XSetClassHint (display, window, class_hint);
-    XFree ((caddr_t) class_hint);
-  }
-  PRIMITIVE_RETURN (UNSPECIFIC);
-}
 \f
 DEFINE_PRIMITIVE ("X-GRAPHICS-DRAW-LINE", Prim_x_graphics_draw_line, 5, 5,
   "(X-GRAPHICS-DRAW-LINE WINDOW X-START Y-START X-END Y-END)\n\

diff --git a/v8/src/microcode/version.h b/v8/src/microcode/version.h
index 344b9e611d9e5eb1c381bc96a3a5b63bc825a118..b57809980b72a9fdd26306a67b536c4ba922f220 100644 (file)
--- 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.98 1991/09/07 22:48:14 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/version.h,v 11.99 1991/10/02 21:17:49 jinx 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     98
+#define SUBVERSION     99
 #endif