Reduce diffs with master.

diff --git a/src/README.txt b/src/README.txt
index 2e14918a69fb902b9998691d150b435385cde897..d41d3f22ffc7d7156d2a3c365d9acdde118ed64b 100644 (file)
--- a/src/README.txt
+++ b/src/README.txt
@@ -64,8 +64,7 @@ The compiler subsystem consists of these three directories:
 
 The editor subsystem consists of two directories:
 
-* "edwin" contains our Emacs-like editor written in Scheme and using
-  several plugins, e.g. gdbm, blowfish and x11.
+* "edwin" contains our Emacs-like editor written in Scheme.
 
 * "imail" contains an email-reading program for Edwin.
 
@@ -80,7 +79,7 @@ There are a few C/Unix FFI plugins:
   package (runtime blowfish).
 
 * "mcrypt" wraps libmcrypt and provides replacements for the mcrypt-*
-  procedures in (runtime crypto).
+  procedures implemented in (runtime crypto).
 
 * "pgsql" wraps libpq and provides a drop-in replacement for the
   microcode module based package (runtime postgresql).

diff --git a/src/Tags.sh b/src/Tags.sh
index 44c5bdf2a9c16f66275651b72f8b32611a0ec19e..b8df303fc75215c04c26d98e202d2f441330e987 100755 (executable)
--- a/src/Tags.sh
+++ b/src/Tags.sh
@@ -29,8 +29,10 @@ set -e
 
 DEFAULT_SUBDIRS=( \
     6001 \
+    blowfish \
     compiler \
     cref \
+    edwin \
     ffi \
     gdbm \
     imail \

diff --git a/tests/runtime/test-string-normalization.scm b/tests/runtime/test-string-normalization.scm
index 27b4f8606309d89cf4a3044678a33b90c9f9d001..703eac76db754901dc6c4aa45124a5df0f5a5270 100644 (file)
--- a/tests/runtime/test-string-normalization.scm
+++ b/tests/runtime/test-string-normalization.scm
@@ -34,7 +34,7 @@ USA.
        (read-file
        (merge-pathnames "test-string-normalization-data"
                         (directory-pathname (current-load-pathname))))))
-\f
+
 (define (norm-tc-source tc) (car tc))
 (define (norm-tc-nfc tc) (cadr tc))
 (define (norm-tc-nfd tc) (caddr tc))