From de150bd9f78c9bc929f487e07526d6beed0e34c6 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Thu, 7 Jul 2011 22:59:44 +0300
Subject: [PATCH] * rename the --separate option into --terminator (mu view)

---
 man/mu-view.1   | 7 +++----
 src/mu-cmd.c    | 6 +++---
 src/mu-config.c | 4 ++--
 src/mu-config.h | 6 +++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/man/mu-view.1 b/man/mu-view.1
index f7b62387..7d672fb5 100644
--- a/man/mu-view.1
+++ b/man/mu-view.1
@@ -25,10 +25,9 @@ any).
 instead of displaying the full message, output a summary based upon the first
 lines of the message.
 
-\fB\-\-separate\fR
-add an ascii \\014 (0x0c, or \fIform-feed\fR) between messages when displaying
-multiple messages.
-
+\fB\-\-terminator\fR
+terminate messaages with a \\f (\fIform-feed\fR) characters when displaying
+them. This is useful when you want to further process them.
 
 .SH BUGS
 
diff --git a/src/mu-cmd.c b/src/mu-cmd.c
index 20f7adaf..e873870e 100644
--- a/src/mu-cmd.c
+++ b/src/mu-cmd.c
@@ -34,7 +34,7 @@
 #include "mu-contacts.h"
 #include "mu-runtime.h"
 
-#define VIEW_SEPARATOR '\f' /* form-feed */
+#define VIEW_TERMINATOR '\f' /* form-feed */
 
 
 static void
@@ -196,8 +196,8 @@ mu_cmd_view (MuConfig *opts)
 		if (rv != MU_EXITCODE_OK)
 			break;
 		/* add a separator between two messages? */
-		if (opts->separate)
-			g_print ("%c", VIEW_SEPARATOR);
+		if (opts->terminator)
+			g_print ("%c", VIEW_TERMINATOR);
 	}
 	
 	return rv;
diff --git a/src/mu-config.c b/src/mu-config.c
index 732f16b8..c3ebc5a3 100644
--- a/src/mu-config.c
+++ b/src/mu-config.c
@@ -245,8 +245,8 @@ config_options_group_view (MuConfig *opts)
 	GOptionEntry entries[] = {
 		{"summary", 0, 0, G_OPTION_ARG_NONE, &opts->summary,
 		 "only show a short summary of the message (false)", NULL},
-		{"separate", 0, 0, G_OPTION_ARG_NONE, &opts->separate,
-		 "separate messages with ascii-0x07 (form-feed)", NULL},
+		{"terminator", 0, 0, G_OPTION_ARG_NONE, &opts->terminator,
+		 "terminate messages with ascii-0x07 (\\f, form-feed)", NULL},
 		{NULL, 0, 0, 0, NULL, NULL, NULL}
 	};
 		
diff --git a/src/mu-config.h b/src/mu-config.h
index 361b8b16..ff05fefe 100644
--- a/src/mu-config.h
+++ b/src/mu-config.h
@@ -108,9 +108,9 @@ struct _MuConfig {
 					 * messages */
 	
 	/* options for view */
-	gboolean         separate;      /* add separator between
-					 * multiple messages in mu
-					 * view */
+	gboolean         terminator;      /* add separator \f between
+					   * multiple messages in mu
+					   * view */
 	
 	/* output to a maildir with symlinks */
 	char            *linksdir;	/* maildir to output symlinks */