From 4c7bce8bbc0328e7179d29bd0d24cba71bc400ab Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Wed, 7 Aug 2019 14:06:42 -0700
Subject: [PATCH] Merge fixes; minimize differences with master.

---
 src/ffi/Makefile-fragment     | 5 +++--
 src/mcrypt/mcrypt.pkg         | 1 -
 src/x11-screen/x11-screen.pkg | 1 +
 src/x11-screen/x11-screen.scm | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/ffi/Makefile-fragment b/src/ffi/Makefile-fragment
index 39ecf9171..31bc3661a 100644
--- a/src/ffi/Makefile-fragment
+++ b/src/ffi/Makefile-fragment
@@ -3,9 +3,10 @@
 
 TARGET_DIR = $(AUXDIR)/ffi
 
+# Install the FFI option.
 install:
 	rm -rf $(DESTDIR)$(TARGET_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(TARGET_DIR)/.
-	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
 	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_DATA) *.bci *.pkd $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(TARGET_DIR)/.
diff --git a/src/mcrypt/mcrypt.pkg b/src/mcrypt/mcrypt.pkg
index 61d13c83c..776c2dae6 100644
--- a/src/mcrypt/mcrypt.pkg
+++ b/src/mcrypt/mcrypt.pkg
@@ -29,7 +29,6 @@ USA.
 (define-package (mcrypt)
   (files "mcrypt")
   (parent ())
-  ;; These are "exported" to (runtime crypto) during load-option.
   (export ()
 	  import-mcrypt)
   (export (mcrypt global)
diff --git a/src/x11-screen/x11-screen.pkg b/src/x11-screen/x11-screen.pkg
index 96f21ef94..0999e46e6 100644
--- a/src/x11-screen/x11-screen.pkg
+++ b/src/x11-screen/x11-screen.pkg
@@ -54,6 +54,7 @@ USA.
 	  register-process-output-events)
   (import (x11)
 	  x-change-property
+	  x-close-all-displays
 	  x-close-display
 	  x-close-window
 	  x-convert-selection
diff --git a/src/x11-screen/x11-screen.scm b/src/x11-screen/x11-screen.scm
index 7111dc2d8..50f8f46a6 100644
--- a/src/x11-screen/x11-screen.scm
+++ b/src/x11-screen/x11-screen.scm
@@ -665,8 +665,8 @@ USA.
 	   execute-button-command
 	   screen
 	   (let ((n (vector-ref event 4)))
-	     (make-down-button (fix:and n #x0ff)
-			       (fix:lsh (fix:and n #xf00) -8)))
+	     (make-down-button (fix:and n #x0FF)
+			       (fix:lsh (fix:and n #xF00) -8)))
 	   (xterm-map-x-coordinate xterm (vector-ref event 2))
 	   (xterm-map-y-coordinate xterm (vector-ref event 3)))))))
 
@@ -683,7 +683,7 @@ USA.
 	   execute-button-command
 	   screen
 	   (let ((n (vector-ref event 4)))
-	     (make-up-button (fix:and n #x0ff)
+	     (make-up-button (fix:and n #x0FF)
 			     (fix:lsh (fix:and n #xF00) -8)))
 	   (xterm-map-x-coordinate xterm (vector-ref event 2))
 	   (xterm-map-y-coordinate xterm (vector-ref event 3)))))))
-- 
2.25.1