diff --git a/man/mu-find.1 b/man/mu-find.1 index b89b6f3b..a60d8173 100644 --- a/man/mu-find.1 +++ b/man/mu-find.1 @@ -429,7 +429,7 @@ details of the bookmarks file. .TP -\fB\-\-no\-msgid\-dups\fR +\fB\-\-no\-dups\fR,\fB-u\fR whenever there are multiple messages with the same name, only show the first one. This is useful if you have copies of the same message, which is a common occurence when using e.g. Gmail together with \fBofflineimap\fR. @@ -450,9 +450,10 @@ information about the message, as in the following table: | other | |-> | |*> | |=> | .fi -Here, the an 'orphan' is a message without a parent message (in the list of +Here, an 'orphan' is a message without a parent message (in the list of matches), and a duplicate is a message whose message-id was already seen -before. +before; not this may not really be the same message, if the message-id was +copied. The algorithm used for determining the threads is based on Jamie Zawinksy's description: diff --git a/mu/mu-cmd-find.c b/mu/mu-cmd-find.c index a7d84179..455ddd76 100644 --- a/mu/mu-cmd-find.c +++ b/mu/mu-cmd-find.c @@ -127,8 +127,8 @@ run_query (MuQuery *xapian, const gchar *query, MuConfig *opts, GError **err) qflags |= MU_QUERY_FLAG_THREADS; if (opts->reverse) qflags |= MU_QUERY_FLAG_DESCENDING; - if (opts->no_msgid_dups) - qflags |= MU_QUERY_FLAG_SKIP_MSGID_DUPS; + if (opts->no_dups) + qflags |= MU_QUERY_FLAG_SKIP_DUPS; iter = mu_query_run (xapian, query, sortid, -1, qflags, err); return iter; diff --git a/mu/mu-config.c b/mu/mu-config.c index 1c625e9b..32e93f66 100644 --- a/mu/mu-config.c +++ b/mu/mu-config.c @@ -213,10 +213,10 @@ config_options_group_find (void) "use a bookmarked query", ""}, {"reverse", 'z', 0, G_OPTION_ARG_NONE, &MU_CONFIG.reverse, "sort in reverse (descending) order (z -> a)", NULL}, - {"no-msgid-dups", 'u', 0, G_OPTION_ARG_NONE, - &MU_CONFIG.no_msgid_dups, - "only show the first of multiple messages with the same " - "message-id (false)", NULL}, + {"no-dups", 'u', 0, G_OPTION_ARG_NONE, + &MU_CONFIG.no_dups, + "show only the first of multiple messages duplicates (false)", + NULL}, {"linksdir", 0, 0, G_OPTION_ARG_STRING, &MU_CONFIG.linksdir, "output as symbolic links to a target maildir", ""}, {"clearlinks", 0, 0, G_OPTION_ARG_NONE, &MU_CONFIG.clearlinks, diff --git a/mu/mu-config.h b/mu/mu-config.h index f80e4d4f..399bcd39 100644 --- a/mu/mu-config.h +++ b/mu/mu-config.h @@ -139,7 +139,7 @@ struct _MuConfig { gchar *exec; /* command to execute on the * files for the matched * messages */ - gboolean no_msgid_dups; /* if there are multiple + gboolean no_dups; /* if there are multiple * messages with the same * msgid, show only the first * one */