From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Thu, 21 Sep 2017 23:00:58 +0000 (-0700)
Subject: Merge branch 'master' into pucked.
X-Git-Tag: mit-scheme-pucked-9.2.12~53
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=2d620ff8404b13a5acce11c0effa05a4ab8ecbc1;p=mit-scheme.git

Merge branch 'master' into pucked.
---

2d620ff8404b13a5acce11c0effa05a4ab8ecbc1
diff --cc src/x11/x11.pkg
index ceb8d09ab,c67e3ae6b..8487a47d6
--- a/src/x11/x11.pkg
+++ b/src/x11/x11.pkg
@@@ -33,12 -33,15 +33,16 @@@ Inc., 51 Franklin St, Fifth Floor, Bost
  (define-package (x11 base)
    (files "x11-base")
    (parent (x11))
+   (import (runtime ustring)
+ 	  cp1-ref
+ 	  ustring-cp-size
+ 	  ustring?)
 +  (export ()
 +	  x-close-all-displays)
    (export (x11)
- 	  ->bytes
+ 	  ->cstring
  	  x-visual-deallocate
  	  x-close-display
 -	  x-close-all-displays
  	  x-window-set-input-hint
  	  x-window-set-name
  	  x-window-set-icon-name