From c43ed156dd3d276ad72026fc75a76373db2d9270 Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adamc@hcoop.net>
Date: Sat, 15 Dec 2007 19:05:43 +0000
Subject: [PATCH 1/1] No more catch-all aliases, and default aliases go to a
 separate file

---
 pcre/mlton/libpcre-h.sml |  2 +-
 src/plugins/alias.sml    | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/pcre/mlton/libpcre-h.sml b/pcre/mlton/libpcre-h.sml
index f45d82f..356df39 100644
--- a/pcre/mlton/libpcre-h.sml
+++ b/pcre/mlton/libpcre-h.sml
@@ -1,4 +1,4 @@
-structure LibpcreiH = struct
+structure LibpcreH = struct
     local
         val lh = DynLinkage.open_lib
              { name = "/usr/local/lib/pcre_sml.so", global = true, lazy = true }
diff --git a/src/plugins/alias.sml b/src/plugins/alias.sml
index 8ed2da6..b96d57d 100644
--- a/src/plugins/alias.sml
+++ b/src/plugins/alias.sml
@@ -85,12 +85,10 @@ val _ = Env.type_one "email"
 datatype aliasSource =
 	 User of string
        | Default
-       | CatchAll
 
 val source = fn (EApp ((EVar "userSource", _), e), _) =>
 		Option.map User (Env.string e)
 	      | (EVar "defaultSource", _) => SOME Default
-	      | (EVar "catchAllSource", _) => SOME CatchAll
 	      | _ => NONE
 
 datatype aliasTarget =
@@ -136,16 +134,11 @@ fun writeSource (env, s, t) =
 		       write ": ";
 		       writeTarget (write, t);
 		       write "\n")
-	  | Default => (write "*@";
-			writeDom ();
-			write ": ";
-			writeTarget (write, t);
-			write "\n")
-	  | CatchAll => (writeD "*@";
-			 writeDomD ();
-			 writeD ": ";
-			 writeTarget (writeD, t);
-			 writeD "\n")
+	  | Default => (writeD "*@";
+			writeDomD ();
+			writeD ": ";
+			writeTarget (writeD, t);
+			writeD "\n")
     end
 			
 val _ = Env.actionV_two "aliasPrim"
-- 
2.20.1