* remove some of the lesser-used single-char versions of command line args

NEWS

@@ -1,5 +1,12 @@
 * NEWS (user visible changes)
 
+** Release 0.8 (unreleased)
+
+  - setting mu home dir now goes with -m, --muhome
+  - log-stderr does have a single-char version anymore
+  - --reindex, --rebuild, --autoupgrade, --nocleanup lost their single char version
+  - --mode lost its single char version
+  
 ** Release 0.7 <2010-02-27 Sat>
    - Database format changed
    - Automatic database scheme version check, notifies users when an upgrade

man/mu-find.1

@@ -165,7 +165,7 @@ order (e.g., from lowest to highest). This is usually a good choice, but for
 dates it may be more useful to sort in the opposite direction.
 
 .TP
-\fB\-x\fR, \fB\-\-xquery\fR
+\fB\-\-xquery\fR
 shows the Xapian query corresponding to your search terms. This is primarily
 meant for for debugging purposes.
 
@@ -176,7 +176,7 @@ output a summary based on up to \fI\len\fR lines of the message. The default is
 , or no summary.
 
 .TP
-\fB\-l\fR, \fB\-\-linksdir\fR \fR=\fI<dir>\fR and \fB\-c\fR, \fB\-\-clearlinks\fR
+\fB\-\-linksdir\fR \fR=\fI<dir>\fR and \fB\-c\fR, \fB\-\-clearlinks\fR
 output the results as a maildir with symbolic links to the found
 messages. This enables easy integration with mail-clients (see below for more
 information). \fBmu\fR will create the maildir if it does not exist yet.

man/mu-index.1

@@ -66,15 +66,15 @@ starts searching at \fI<maildir>\fR. By default, \fBmu\fR uses whatever the
 Also please see the note on mixing sub-maildirs below.
 
 .TP
-\fB\-r\fR, \fB\-\-reindex\fR
+\fB\-\-reindex\fR
 re-index all mails, even ones that are already in the database.
 
 .TP
-\fB\-n\fR, \fB\-\-nocleanup\fR
+\fB\-\-nocleanup\fR
 disables the database cleanup that \fBmu\fR does by default after indexing.
 
 .TP
-\fB\-y\fR, \fB\-\-rebuild\fR
+\fB\-\-rebuild\fR
 clear all messages from the database before
 indexing. This is effectively the same as removing the database. The
 difference with \fB\-\-reindex\fR is that \fB\-\-rebuild\fR guarantees that
@@ -85,7 +85,7 @@ messages (using \fB\-\-maildir\fR). For this reason, it is necessary to run
 format. \fBmu index\fR will issue a warning about this.
 
 .TP
-\fB\-u\fR, \fB\-\-autoupgrade\fR automatically use \fB\-y\fR, \fB\-\-empty\fR
+\fB\-\-autoupgrade\fR automatically use \fB\-y\fR, \fB\-\-empty\fR
 when \fBmu\fR notices that the database version is not up-to-date. This option
 is for use in cron scripts and the like, so they won't require any user
 interaction, even when mu introduces a new database vesion.

man/mu-mkdir.1

@@ -25,6 +25,12 @@ will create three Maildirs \fItom\fR, \fIdick\fR and \fIharry\fR.
 If the creation somehow fails, for safety reasons, \fBno\fR attempt is made to
 remove any parts that were created.
 
+.SH OPTIONS
+
+.TP
+\fB\-\-mode\fR=<mode>
+set the file access mode for the new maildir as in chmod(1)
+
 .SH BUGS
 
 There probably are some; please report bugs when you find them:
@@ -38,3 +44,4 @@ Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 
 .BR maildir(5)
 .BR mu(1)
+.BR chmod(1)

man/mu.1

@@ -87,10 +87,11 @@ man-pages; here the general options are discussed.
 
 .SH GENERAL OPTIONS
 
-\fBmu\fR offers a number of general options that apply to all commands:
+\fBmu\fR offers a number of general options that apply to all commands,
+including \fBmu\fR without any command.
 
 .TP
-\fB\-a\fR, \fB\-\-muhome\fR
+\fB\-m\fR, \fB\-\-muhome\fR
 causes \fBmu\fR to use an alternative directory to
 store and read its database and logs. By default, \fI~/.mu\fR is used.
 
@@ -111,7 +112,7 @@ index\fR is \fBmuch\fR faster with \fB\-\-quiet\fR, so it is recommended you
 use this option when using \fBmu\fR from scripts etc.
 
 .TP
-\fB\-e\fR, \fB\-\-log-stderr\fR
+\fB\-\-log-stderr\fR
 causes \fBmu\fR not to output all log messages
 to standard error, in addition to sending them to the log file.
 

src/mu-config.c

@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+** Copyright (C) 2008-2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 **
 ** This program is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by the
@@ -17,7 +17,9 @@
 **
 */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /*HAVE_CONFIG_H*/
 
 #include <glib.h>
 #include <string.h> /* memset */
@@ -65,9 +67,9 @@ config_options_group_mu (MuConfigOptions *opts)
 		  "don't give any progress information", NULL },
 		{"version", 'v', 0, G_OPTION_ARG_NONE, &opts->version,
 		 "display version and copyright information", NULL},
-		{"muhome", 'a', 0, G_OPTION_ARG_FILENAME, &opts->muhome,
+		{"muhome", 'm', 0, G_OPTION_ARG_FILENAME, &opts->muhome,
 		 "specify an alternative mu directory", NULL},
-		{"log-stderr", 'e', 0, G_OPTION_ARG_NONE, &opts->log_stderr,
+		{"log-stderr", 0, 0, G_OPTION_ARG_NONE, &opts->log_stderr,
 		 "log to standard error", NULL},
 		{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY,
 		  &opts->params, "parameters", NULL },
@@ -105,13 +107,13 @@ config_options_group_index (MuConfigOptions *opts)
 	GOptionEntry entries[] = {
 		{"maildir", 'm', 0, G_OPTION_ARG_FILENAME, &opts->maildir,
 		 "top of the maildir", NULL},
-		{"reindex", 'r', 0, G_OPTION_ARG_NONE, &opts->reindex,
+		{"reindex", 0, 0, G_OPTION_ARG_NONE, &opts->reindex,
 		 "index already indexed messages too", NULL},
-		{"rebuild", 'y', 0, G_OPTION_ARG_NONE, &opts->rebuild,
+		{"rebuild", 0, 0, G_OPTION_ARG_NONE, &opts->rebuild,
 		 "rebuild the database from scratch", NULL},
-		{"autoupgrade", 'u', 0, G_OPTION_ARG_NONE, &opts->autoupgrade,
+		{"autoupgrade", 0, 0, G_OPTION_ARG_NONE, &opts->autoupgrade,
 		 "automatically upgrade the database with new mu versions", NULL},
-		{"nocleanup", 'n', 0, G_OPTION_ARG_NONE, &opts->nocleanup,
+		{"nocleanup", 0, 0, G_OPTION_ARG_NONE, &opts->nocleanup,
 		 "don't clean up the database after indexing", NULL},
 		{ NULL, 0, 0, 0, NULL, NULL, NULL }
 	};
@@ -155,7 +157,7 @@ config_options_group_find (MuConfigOptions *opts)
 {
 	GOptionGroup *og;
 	GOptionEntry entries[] = {
-		{"xquery", 'x', 0, G_OPTION_ARG_NONE, &opts->xquery,
+		{"xquery", 0, 0, G_OPTION_ARG_NONE, &opts->xquery,
 		 "print the Xapian query (for debugging)", NULL},
 		{"fields", 'f', 0, G_OPTION_ARG_STRING, &opts->fields,
 		 "fields to display in the output", NULL},
@@ -165,9 +167,9 @@ config_options_group_find (MuConfigOptions *opts)
 		 "sort in descending order (z -> a)", NULL},
 		{"summary-len", 'k', 0, G_OPTION_ARG_INT, &opts->summary_len,
 		 "max number of lines for summary", NULL},
-		{"linksdir", 'l', 0, G_OPTION_ARG_STRING, &opts->linksdir,
+		{"linksdir", 0, 0, G_OPTION_ARG_STRING, &opts->linksdir,
 		 "output as symbolic links to a target maildir", NULL },
-		{"clearlinks", 'c', 0, G_OPTION_ARG_NONE, &opts->clearlinks,
+		{"clearlinks", 0, 0, G_OPTION_ARG_NONE, &opts->clearlinks,
 		 "clear old links before filling a linksdir", NULL},
 		{ NULL, 0, 0, 0, NULL, NULL, NULL }
 	};
@@ -187,7 +189,7 @@ config_options_group_mkdir (MuConfigOptions *opts)
 {
 	GOptionGroup *og;
 	GOptionEntry entries[] = {
-		{"mode", 'p', 0, G_OPTION_ARG_INT, &opts->dirmode,
+		{"mode", 0, 0, G_OPTION_ARG_INT, &opts->dirmode,
 		 "set the mode (as in chmod), in octal notation", NULL},
 		{ NULL, 0, 0, 0, NULL, NULL, NULL }
 	};