Index: help.c
===================================================================
--- help.c	(revision 1aee7d914de75510e7cf09c452bad63b2dad2166)
+++ help.c	(revision 6794f72456590c5f86ebd58206474534693d974f)
@@ -12,95 +12,96 @@
   owl_fmtext_init_null(&fm);
   owl_fmtext_append_bold
-     (&fm, 
-      "OWL HELP\n\n");
+    (&fm, 
+     "OWL HELP\n\n");
 
   owl_fmtext_append_normal
-     (&fm, 
-      "  For help on a specific command use 'help <command>'\n"
-      "  For information on advanced keys, do 'M-x show keymaps'.\n"
-      "  For information on advanced commands, do 'M-x show commands'.\n"
-      "  For information on variables, do 'M-x show variables'.\n\n");
+    (&fm, 
+     "  For help on a specific command use 'help <command>'\n"
+     "  For information on advanced keys, use 'show keymaps'.\n"
+     "  For information on advanced commands, use 'show commands'.\n"
+     "  For information on variables, use 'show variables'.\n\n");
 
   owl_fmtext_append_bold
-     (&fm, 
-      "  Basic Keys:\n"
-      );
+    (&fm, 
+     "  Basic Keys:\n"
+     );
   owl_fmtext_append_normal
-     (&fm, 
-      "    n             Move to next non-deleted message\n"
-      "    p             Move to previous non-deleted message\n"
-      "    C-n , down    Move to next message\n"
-      "    C-p , up      Move to previous message\n"
-      "    < , >         Move to first, last message\n"
-      "    right , left  Scroll screen left or right\n"
-      "    C-v           Page down\n"
-      "    M-v           Page up\n"
-      "    i             Print more information about a message\n"
-      "    P             Move to the next personal message\n"
-      "    M-P           Move to the preivous personal message\n"
-      "\n"
-      "    d             Mark message for deletion\n"
-      "    u             Undelete a message marked for deletion\n"
-      "    x             Expunge deleted messages\n"
-      "    X             Expunge deleted messages and switch view\n"
-      "    T             Mark all 'trash' messages for deletion\n"
-      "\n"
-      "    z             Start a zwrite command\n"
-      "    r             Reply to the current message\n"
-      "    R             Reply to sender\n"
-      "    C-r           Reply but allow editing of reply line\n"
-      "\n"
-      "    M-n           View zephyrs to selected conversation\n"
-      "    v             Start a view command\n"
-      "\n"
-      "    A             Toggle zaway\n"
-      "    w             Open a URL in the message in netscape\n"
-      "    C-l           Refresh the screen\n"
-      "    C-z           Suspend\n"
-      "    h             Print this help message\n"
-      "    : , M-x       Enter one of the commands below\n"
-      "\n\n"
-      );
+    (&fm, 
+     "    n             Move to next non-deleted message\n"
+     "    p             Move to previous non-deleted message\n"
+     "    C-n , down    Move to next message\n"
+     "    C-p , up      Move to previous message\n"
+     "    < , >         Move to first, last message\n"
+     "    right , left  Scroll screen left or right\n"
+     "    C-v           Page down\n"
+     "    M-v           Page up\n"
+     "    i             Print more information about a message\n"
+     "    P             Move to the next personal message\n"
+     "    M-P           Move to the preivous personal message\n"
+     "\n"
+     "    d             Mark message for deletion\n"
+     "    u             Undelete a message marked for deletion\n"
+     "    x             Expunge deleted messages\n"
+     "    X             Expunge deleted messages and switch view\n"
+     "    T             Mark all 'trash' messages for deletion\n"
+     "    M-D           Mark all messages in current view for deletion\n"
+     "    M-u           Unmark all messages in the current view for deletion\n"
+     "\n"
+     "    z             Start a zwrite command\n"
+     "    r             Reply to the current message\n"
+     "    R             Reply to sender\n"
+     "    C-r           Reply but allow editing of reply line\n"
+     "\n"
+     "    M-n           View zephyrs to selected conversation\n"
+     "    M-N           View zephyrs to selected converstaion by instance\n"
+     "    v             Start a view command\n"
+     "\n"
+     "    A             Toggle zaway\n"
+     "    w             Open a URL in the message in netscape\n"
+     "    C-l           Refresh the screen\n"
+     "    C-z           Suspend\n"
+     "    h             Print this help message\n"
+     "    : , M-x       Enter one of the commands below\n"
+     "\n\n"
+     );
   owl_fmtext_append_bold
-     (&fm, 
-      "  Basic Commands:\n"
-      );
+    (&fm, 
+     "  Basic Commands:\n"
+     );
   owl_fmtext_append_normal
-     (&fm, 
-      "    quit, exit    Exit owl\n"
-      "    help          Get help about commands\n"
-      "    show          Show information about owl (see detailed help)\n"
-      "\n"
-      "    zwrite        Send a zephyr\n"
-      "    reply         Reply to the current zephyr\n"
-      "\n"
-      "    zlog          Send a login or login notification\n"
-      "    subscribe     Subscribe to a zephyr class or instance\n"
-      "    unsubscribe   Unsubscribe to a zephyr class or instance\n"
-      "    unsuball      Unsubscribe from all zephyr classes\n"
-      "    getsubs       Print a list of current subscriptions\n"
-      "    zlocate       Locate a user\n"
-      "    info          Print detailed information about the current message\n"
-      "    filter        Create a message filter\n"
-      "    view          View messages matching a filter\n"
-      "    viewuser      View messages to or from a particular user\n"
-      "    viewclass     View messages to a particular class\n"
-      "    expunge       Expunge messages marked for deletion\n"
-      "    first         Move to the first message\n"
-      "    last          Move to the last message\n"
-      "    zaway         Turn zaway on or off, or set the message\n"
-      "    load-subs     Load zephyr subscriptions from a file\n"
-      "\n"
-      "    set           Set a variable (see list below)\n"
-      "    print         Print a variable's value (variables listed below)\n"
-      "\n"
-      "    about         Print information about owl\n"
-      "    status        Print status information about the running owl\n"
-      "    version       Print the version number of owl\n"
-      "\n");
+    (&fm, 
+     "    quit, exit    Exit owl\n"
+     "    help          Get help about commands\n"
+     "    show          Show information about owl (see detailed help)\n"
+     "\n"
+     "    zwrite        Send a zephyr\n"
+     "    reply         Reply to the current zephyr\n"
+     "\n"
+     "    zlog          Send a login or logout notification\n"
+     "    subscribe     Subscribe to a zephyr class or instance\n"
+     "    unsubscribe   Unsubscribe to a zephyr class or instance\n"
+     "    unsuball      Unsubscribe from all zephyr classes\n"
+     "    getsubs       Print a list of current subscriptions\n"
+     "    zlocate       Locate a user\n"
+     "    info          Print detailed information about the current message\n"
+     "    filter        Create a message filter\n"
+     "    view          View messages matching a filter\n"
+     "    viewuser      View messages to or from a particular user\n"
+     "    viewclass     View messages to a particular class\n"
+     "    expunge       Expunge messages marked for deletion\n"
+     "    zaway         Turn zaway on or off, or set the message\n"
+     "    load-subs     Load zephyr subscriptions from a file\n"
+     "\n"
+     "    set           Set a variable (see list below)\n"
+     "    print         Print a variable's value (variables listed below)\n"
+     "\n"
+     "    about         Print information about owl\n"
+     "    status        Print status information about the running owl\n"
+     "    version       Print the version number of owl\n"
+     "\n");
   
   /* help for variables */
   owl_fmtext_append_bold(&fm, 
-      "Variables:\n");
+			 "Variables:\n");
   owl_variable_dict_get_names(owl_global_get_vardict(&g), &varnames);
   owl_variable_get_summaryheader(&fm);
@@ -120,3 +121,2 @@
   owl_fmtext_free(&fm);
 }
-
