X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2Fconfig.c;h=54fea67d06660a2d21193a428116272228deaab2;hp=3f9d106126a6c72a7c5a75dcab076db03c78958a;hb=fd00a3b030ab9d854eac79641f7bf25e6538acc1;hpb=7030d7edb099bff36ded7548bb5380f7acab4f9b

diff --git a/config/config.c b/config/config.c
index 3f9d106..54fea67 100644
--- a/config/config.c
+++ b/config/config.c
@@ -27,7 +27,7 @@ struct node *m_defs;    /* profile/context structure  */
 
 
 /*
-** nmh constants
+** nmh constants: standard file names
 **
 ** Important: Adjust uip/mmh.sh if you make changes here!
 */
@@ -45,20 +45,11 @@ char *profile = "profile";
 char *context = "context";
 
 /*
-** Default name of file for public sequences.  If NULL,
-** then nmh will use private sequences by default, unless the
-** user defines a value using the "mh-sequences" profile entry.
+** Default name of file for public sequences. Gets overridden
+** by a `Mh-Sequences' entry in the user's profile. Set to NULL
+** or the empty string to use private sequences by default.
 */
-#ifdef NOPUBLICSEQ
-	char *mh_seq = NULL;
-#else
-	char *mh_seq = ".mh_sequences";
-#endif
-
-
-/* name of current message "sequence" */
-char *current = "cur";
-
+char *mh_seq = ".mh_sequences";
 
 /* standard component files */
 char *components     = "components";       /* comp         */
@@ -74,11 +65,19 @@ char *mhlformat      = "mhl.format";       /* show         */
 char *mhlreply       = "mhl.reply";        /* repl -filter */
 char *mhlforward     = "mhl.forward";      /* forw -filter */
 
-char *inbox = "Inbox";
-char *defaultfolder = "+inbox";
 
+/*
+** standard names for: mail folders, sequences, and profile entries
+*/
+
+/* some default folder names */
+char *defaultfolder = "+inbox";
 char *draftfolder = "+drafts";
 
+/* name of current message "sequence" */
+char *current = "cur";
+
+char *inbox = "Inbox";  /* profile entry name to specify the default folder */
 char *curfolder = "Current-Folder";
 char *usequence = "Unseen-Sequence";
 char *psequence = "Previous-Sequence";
@@ -93,8 +92,9 @@ char *nmhprivcache = "nmh-private-cache";
 char *nmhaccessftp = "nmh-access-ftp";
 
 
+
 /*
-** nmh processes
+** nmh default programs
 */
 
 /*
@@ -125,12 +125,6 @@ char *fileproc = NMHBINDIR"/refile";
 char *incproc = NMHBINDIR"/inc";
 
 /*
-** When a user runs an nmh program for the first time, this program
-** is called to create his nmh profile, and mail directory.
-*/
-char *installproc = NMHLIBDIR"/install-mh";
-
-/*
 ** This is the default program invoked by a "list" response
 ** at the "What now?" prompt.  It is also used by the draft
 ** folder facility in comp/dist/forw/repl to display the
@@ -151,19 +145,11 @@ char *mailproc = NMHBINDIR"/mhmail";
 char *moreproc = "more";
 
 /*
-** This is the program (mhl) used to filter messages.  It is
-** used by mhshow to filter and display the message headers of
-** MIME messages.  It is used by repl/forw (with -filter)
-** to filter the message to which you are replying/forwarding.
-** It is used by send/spost (with -filter) to filter the message
-** for "Bcc:" recipients.
-*/
-char *mhlproc = NMHLIBDIR"/mhl";
-
-/*
-** This program is called to pack a folder.
+** This is the editor invoked by the various message
+** composition programs.  It SHOULD be a full screen
+** editor, such as vi or emacs, but any editor will work.
 */
-char *packproc = NMHBINDIR"/packf";
+char *defaulteditor = "vi";
 
 /*
 ** This is the delivery program called by send to actually
@@ -178,11 +164,6 @@ char *postproc = NMHLIBDIR"/spost";
 char *rcvstoreproc = NMHLIBDIR"/rcvstore";
 
 /*
-** This program is called to remove a folder.
-*/
-char *rmfproc = NMHBINDIR"/rmf";
-
-/*
 ** This program is called to remove a message by rmm or refile -nolink.
 ** It's usually empty, which means to rename the file to a backup name.
 */
@@ -209,6 +190,16 @@ char *showmimeproc = NMHBINDIR"/mhshow";
 char *showproc = NMHLIBDIR"/mhl";
 
 /*
+** This is the program (mhl) used to filter messages.  It is
+** used by mhshow to filter and display the message headers of
+** MIME messages.  It is used by repl/forw (with -filter)
+** to filter the message to which you are replying/forwarding.
+** It is used by send/spost (with -filter) to filter the message
+** for "Bcc:" recipients.
+*/
+char *mhlproc = NMHLIBDIR"/mhl";
+
+/*
 ** This program is called after comp, et. al., have built a draft
 */
 char *whatnowproc = NMHBINDIR"/whatnow";
@@ -218,18 +209,16 @@ char *whatnowproc = NMHBINDIR"/whatnow";
 */
 char *sendmail = SENDMAILPATH;
 
+
 /*
-** The prefix that is prepended to the name of message files when they
-** are "removed" by rmm. This should typically be `,' or `#'.
+** file stuff
 */
-char *backup_prefix = ",";
 
 /*
-** This is the editor invoked by the various message
-** composition programs.  It SHOULD be a full screen
-** editor, such as vi or emacs, but any editor will work.
+** The prefix that is prepended to the name of message files when they
+** are "removed" by rmm. This should typically be `,' or `#'.
 */
-char *defaulteditor = "vi";
+char *backup_prefix = ",";
 
 /*
 ** Name of link to file to which you are replying or which you are