summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--README7
-rw-r--r--man/mintro.78
-rw-r--r--man/mless.14
-rw-r--r--man/msetseq.143
-rwxr-xr-xmless2
-rwxr-xr-xmsetseq13
6 files changed, 9 insertions, 68 deletions
diff --git a/README b/README
index f7cf867..a902870 100644
--- a/README
+++ b/README
@@ -22,8 +22,7 @@ DESCRIPTION
      mmime(1)    to create MIME messages
      mrepl(1)    to reply to mail
      mscan(1)    to generate single line summaries of mail
-     mseq(1)     to deal with mail sequences
-     msetseq(1)  to set the mail sequence
+     mseq(1)     to manipulate mail sequences
      mshow(1)    to render mail and extract attachments
      msort(1)    to sort mail
      mthread(1)  to arrange mail into discussions
@@ -65,8 +64,8 @@ EXAMPLES
      INBOX, oldest first.
            mlist -s ~/Maildir/INBOX | msort -d | mscan
      To operate on a set of mails in multiple steps, you can save a list of
-     mail as a sequence.  E.g. add a call to ‘msetseq’ to above command:
-           mlist -s ~/Maildir/INBOX | msort -d | msetseq | mscan
+     mail as a sequence.  E.g. add a call to ‘mseq -S’ to above command:
+           mlist -s ~/Maildir/INBOX | msort -d | mseq -S | mscan
      Now mscan will show message numbers and you could look at the first five
      mails at once, for example:
            mshow 1:5
diff --git a/man/mintro.7 b/man/mintro.7
index 1577695..4472b55 100644
--- a/man/mintro.7
+++ b/man/mintro.7
@@ -43,9 +43,7 @@ to reply to mail
 .It Xr mscan 1
 to generate single line summaries of mail
 .It Xr mseq 1
-to deal with mail sequences
-.It Xr msetseq 1
-to set the mail sequence
+to manipulate mail sequences
 .It Xr mshow 1
 to render mail and extract attachments
 .It Xr msort 1
@@ -117,9 +115,9 @@ INBOX, oldest first.
 To operate on a set of mails in multiple steps, you can save a list of mail
 as a sequence.
 E.g. add a call to
-.Ql msetseq
+.Ql mseq -S
 to above command:
-.Dl mlist -s ~/Maildir/INBOX | msort -d | msetseq | mscan
+.Dl mlist -s ~/Maildir/INBOX | msort -d | mseq -S | mscan
 Now mscan will show message numbers and you could look at the first
 five mails at once, for example:
 .Dl mshow 1:5
diff --git a/man/mless.1 b/man/mless.1
index f7210f3..753f144 100644
--- a/man/mless.1
+++ b/man/mless.1
@@ -19,7 +19,7 @@ See
 for the message argument syntax.
 .Pp
 When no messages are passed and standard input is from a pipe,
-.Xr msetseq 1
+.Ql mseq -S
 will be called and
 .Nm
 is run on the resulting sequence.
@@ -38,7 +38,7 @@ displaying the current message if possible.
 .Sh SEE ALSO
 .Xr less 1 ,
 .Xr mscan 1 ,
-.Xr msetseq 1 ,
+.Xr mseq 1 ,
 .Xr mshow 1 ,
 .Xr mmsg 7
 .Sh AUTHORS
diff --git a/man/msetseq.1 b/man/msetseq.1
deleted file mode 100644
index a07af7d..0000000
--- a/man/msetseq.1
+++ /dev/null
@@ -1,43 +0,0 @@
-.Dd July 22, 2016
-.Dt MSETSEQ 1
-.Os
-.Sh NAME
-.Nm msetseq
-.Nd set mail sequence
-.Sh SYNOPSIS
-.Nm
-.Op Fl a
-.Sh DESCRIPTION
-.Nm
-sets the mail sequence to the file names passed on standard input.
-.Pp
-When used in a pipe,
-.Nm
-will also output the full sequence, so it can be used in a pipe.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl a
-Append to the mail sequence instead of replacing it.
-.El
-.Sh ENVIRONMENT
-.Bl -tag -width Ds
-.It Ev MAILMAP
-File were the sequence is stored.
-(Default:
-.Pa ~/.santoku/map )
-.El
-.Sh EXIT STATUS
-.Ex -std
-.Sh AUTHORS
-.An Christian Neukirchen Aq Mt chneukirchen@gmail.com
-.Sh LICENSE
-.Nm
-is in the public domain.
-.Pp
-To the extent possible under law,
-the creator of this work
-has waived all copyright and related or
-neighboring rights to this work.
-.Pp
-.Lk http://creativecommons.org/publicdomain/zero/1.0/
diff --git a/mless b/mless
index e35275f..8cfed33 100755
--- a/mless
+++ b/mless
@@ -50,7 +50,7 @@ fi
 
 scantab=
 if [ "$#" -eq 0 ] && ! [ -t 0 ]; then
-	msetseq >/dev/null
+	mseq -S >/dev/null
 	set -- :
 	scantab=//scan
 fi
diff --git a/msetseq b/msetseq
deleted file mode 100755
index e404e0f..0000000
--- a/msetseq
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-# msetseq [-a] - store/append stdin as santoku seq (can be used as filter)
-
-: ${MAILMAP:=~/.santoku/map}
-
-if [ "$1" = -a ]; then
-	cat ${MAILMAP} - >"${MAILMAP}-"
-else
-	cat >"${MAILMAP}-"
-fi
-mv "${MAILMAP}" "${MAILMAP}.old" || true
-mv "${MAILMAP}-" "${MAILMAP}"
-[ -t 1 ] || cat "${MAILMAP}"