Merge fixes; minimize differences with master.

diff --git a/src/ffi/Makefile-fragment b/src/ffi/Makefile-fragment
index 39ecf91711e23960dee81e8775b3f30e6c8f7ddf..31bc3661a37a2674e43f9e08c91db4bd01f4cd6a 100644 (file)
--- 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 61d13c83c3bab6b1f78288c8493ad72e1f2aee1d..776c2dae682310431be3f498050d7aca793b6fcf 100644 (file)
--- 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 96f21ef944ae56742551a2bf1074bce543fef95f..0999e46e60bf19c1726e0a6ed9e411f013dfc692 100644 (file)
--- 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 7111dc2d8b04bd23cd7685495e66302702c6a7eb..50f8f46a64ea45eadd39e91504c0e71deddb4110 100644 (file)
--- 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)))))))