Index: /trunk/Ohana/src/addstar/src/args.c
===================================================================
--- /trunk/Ohana/src/addstar/src/args.c	(revision 16991)
+++ /trunk/Ohana/src/addstar/src/args.c	(revision 16992)
@@ -163,8 +163,12 @@
     remove_argument (N, &argc, argv);
   }
-  /* use 'closest star' matching, rather than traditional method */
-  options.closest = FALSE;
+  /* use 'closest star' matching by default */
+  options.closest = TRUE;
   if ((N = get_argument (argc, argv, "-closest"))) {
     options.closest = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-all-matches"))) {
+    options.closest = FALSE;
     remove_argument (N, &argc, argv);
   }
Index: /trunk/Ohana/src/addstar/src/args_client.c
===================================================================
--- /trunk/Ohana/src/addstar/src/args_client.c	(revision 16991)
+++ /trunk/Ohana/src/addstar/src/args_client.c	(revision 16992)
@@ -111,8 +111,12 @@
     remove_argument (N, &argc, argv);
   }
-  /* use 'closest star' matching, rather than traditional method */
-  options.closest = FALSE;
+  /* use 'closest star' matching by default */
+  options.closest = TRUE;
   if ((N = get_argument (argc, argv, "-closest"))) {
     options.closest = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-all-matches"))) {
+    options.closest = FALSE;
     remove_argument (N, &argc, argv);
   }