Change the default editor from 'vi' to 'prompter'.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index c853086381eb24ede00d60910e1e396065f505d7..8a7949813eb3d63fc8047b9af36fff6e94fa796c 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -7,10 +7,33 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/crawl_folders.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/concat.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/ssequal.h"
+#include "sbr/getcpy.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_pack.h"
+#include "sbr/folder_free.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_del.h"
+#include "sbr/context_find.h"
+#include "sbr/brkstring.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "sbr/crawl_folders.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_maildir.h"
 
 #define FOLDER_SWITCHES \
@@ -96,8 +119,7 @@ static void readonly_folders (void);
  * Function for printing error message if folder does not exist with
  * -nocreate.
  */
-static
-void
+static void
 nonexistent_folder (int status)
 {
     NMH_UNUSED (status);
@@ -108,7 +130,7 @@ nonexistent_folder (int status)
 int
 main (int argc, char **argv)
 {
-    bool printsw = false;
+    int printsw = -1;
     bool listsw = false;
     bool pushsw = false;
     bool popsw = false;
@@ -202,10 +224,10 @@ main (int argc, char **argv)
                    continue;
 
                case PRNTSW: 
-                   printsw = true;
+                   printsw = 1;
                    continue;
                case NPRNTSW: 
-                   printsw = false;
+                   printsw = 0;
                    continue;
 
                case LISTSW: 
@@ -243,11 +265,13 @@ main (int argc, char **argv)
     nmhdir = concat (m_maildir (""), "/", NULL);
 
     /*
-     * If we aren't working with the folder stack
-     * (-push, -pop, -list) then the default is to print.
+     * If not directed via -print/-noprint, we print folder summary
+     * info unless if we're working with the folder stack (i.e.,
+     * -push, -pop, or -list).
      */
-    if (!pushsw && !popsw && !listsw)
-       printsw = true;
+    if (printsw == -1) {
+       printsw = !(pushsw || popsw || listsw);
+    }
 
     /* Pushing a folder onto the folder stack */
     if (pushsw) {
@@ -372,7 +396,8 @@ main (int argc, char **argv)
     /*
      * Print out folder information
      */
-    print_folders();
+    if (printsw)
+       print_folders();
 
     context_save ();   /* save the context file */
     done (0);