From: markus schnalke Date: Wed, 8 Feb 2012 20:47:20 +0000 (+0100) Subject: Annotations will always be done inplace from now on. X-Git-Tag: mmh-thesis-end~349 X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=c8195849d2e366c569271abb0f5f60f4ebf0b4d0;p=mmh Annotations will always be done inplace from now on. --- diff --git a/docs/COMPLETION-BASH b/docs/COMPLETION-BASH index 746f899..918e285 100644 --- a/docs/COMPLETION-BASH +++ b/docs/COMPLETION-BASH @@ -58,7 +58,7 @@ _nmh() ;; forw ) options=(-annotate -noannotate -form -format -noformat - -filter -inplace -noinplace -mime -nomime + -filter -mime -nomime -editor -noedit -whatnowproc -nowhatnowproc -build -file -version -help) @@ -96,7 +96,7 @@ _nmh() repl ) options=(-annotate -noannotate -group -nogroup -cc -nocc -query -noquery -form -format -noformat -filter - -inplace -noinplace -mime -nomime -fcc -width + -mime -nomime -fcc -width -editor -noedit -whatnowproc -nowhatnowproc -build -file -version -help) ;; diff --git a/docs/COMPLETION-ZSH b/docs/COMPLETION-ZSH index b5aeb25..86ee4b4 100644 --- a/docs/COMPLETION-ZSH +++ b/docs/COMPLETION-ZSH @@ -129,7 +129,7 @@ compctl -K mhfseq -x 's[+][@],c[-1] s[+][@]' \ compctl -K mhfseq -x 's[+][@]' \ -K mhcomp -S / -q - 'c[-1]' -K mhfseq -\ 's[-]' -k "(annotate noannotate cc nocc \ - editor noedit fcc filter form group nogroup inplace noinplace + editor noedit fcc filter form group nogroup \ query noquery width whatnowproc nowhatnowproc help)" - 'c[-1,(cc|nocc)]' \ -k "(all to cc me)" - 'C[-1,-(filter|form)]' -K mhfile - \ 'C[-1,-(editor|whatnowproc)]' -c -- repl diff --git a/h/prototypes.h b/h/prototypes.h index cd282b0..d9b105b 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -138,14 +138,14 @@ int strncasecmp(const char *s1, const char *s2, size_t n); /* ** prototypes for some routines in uip */ -int annotate(char *, char *, char *, int, int, int, int); +int annotate(char *, char *, char *, int, int, int); void annolist(char *, char *, char *, int); void annopreserve(int); int distout(char *, char *, char *); void replout(FILE *, char *, char *, struct msgs *, int, char *, char *, char *); int what_now(char *, int, int, char *, char *, int, struct msgs *, - char *, int, char *); + char *, char *); /* ** from the former mts.h diff --git a/man/anno.man1 b/man/anno.man1 index 65db87e..1e27cf5 100644 --- a/man/anno.man1 +++ b/man/anno.man1 @@ -12,7 +12,6 @@ anno \- annotate messages .RI [ msgs ] .RB [ \-component .IR field ] -.RB [ \-inplace " | " \-noinplace ] .RB [ \-date " | " \-nodate ] .RB [ \-append ] .RB [ \-list ] @@ -85,12 +84,9 @@ The field specified must be a valid 2822-style message field name, which means that it may only consist of alphanumerics and dashes, The body specified is arbitrary text. .PP -Normally .B anno -does the annotation inplace in order to preserve -any links to the message. You may change this by using the -.B \-noinplace -switch. +always does the annotation inplace in order to preserve +any links to the message. .PP The .B -list @@ -170,7 +166,6 @@ dist(1), forw(1), repl(1) .nf .RI ` +folder "' defaults to the current folder" .RI ` msgs "' defaults to cur" -.RB ` \-inplace ' .RB ` \-date ' .fi diff --git a/man/dist.man1 b/man/dist.man1 index a1eeab4..8bcec7d 100644 --- a/man/dist.man1 +++ b/man/dist.man1 @@ -13,7 +13,6 @@ dist \- redistribute a message to additional addresses .RB [ \-form .IR formfile ] .RB [ \-annotate " | " \-noannotate ] -.RB [ \-inplace " | " \-noinplace ] .RB [ \-editor .IR editor ] .RB [ \-noedit ] @@ -79,11 +78,8 @@ If the message is not sent immediately from .RB \*(lq comp .BR \-use \*(rq may be used to re\-edit and send the constructed -message, but the annotations won't take place. Normally annotations are -done inplace in order to preserve any links to the message. You may use -the -.B \-noinplace -switch to change this. +message, but the annotations won't take place. Annotations are always +done inplace in order to preserve any links to the message. .PP See .BR comp (1) @@ -151,7 +147,6 @@ comp(1), forw(1), repl(1), send(1), whatnow(1) .RB ` +folder "' defaults to the current folder" .RB ` msg "' defaults to cur" .RB ` \-noannotate ' -.RB ` \-inplace ' .fi .SH CONTEXT diff --git a/man/forw.man1 b/man/forw.man1 index 2f3fa6e..356911e 100644 --- a/man/forw.man1 +++ b/man/forw.man1 @@ -16,7 +16,6 @@ forw \- forward messages .RB [ \-format " | " \-noformat ] .RB [ \-filter .IR filterfile ] -.RB [ \-inplace " | " \-noinplace ] .RB [ \-mime " | " \-nomime ] .RB [ \-editor .IR editor ] @@ -90,11 +89,8 @@ If the message is not sent immediately from .RB \*(lq comp .BR \-use \*(rq may be used to re\-edit and send the constructed -message, but the annotations won't take place. Normally annotations -are done inplace in order to preserve any links to the message. You may -change this by using the -.B \-noinplace -switch. +message, but the annotations won't take place. Annotations +are always done inplace in order to preserve any links to the message. .PP See .BR comp (1) @@ -312,7 +308,6 @@ mhbuild(1), comp(1), repl(1), send(1), whatnow(1), mh\-format(5), .RB ` msgs "' defaults to cur" .RB ` \-noannotate ' .RB ` \-noformat ' -.RB ` \-inplace ' .RB ` \-nomime ' .fi diff --git a/man/mh-chart.man1 b/man/mh-chart.man1 index baaa28d..bea085b 100644 --- a/man/mh-chart.man1 +++ b/man/mh-chart.man1 @@ -23,7 +23,6 @@ mh-chart \- Chart of nmh Commands .RI [ msgs ] .RB [ \-component .IR field ] -.RB [ \-inplace " | " \-noinplace ] .RB [ \-date " | " \-nodate ] .RB [ \-version ] .RB [ \-help ] @@ -90,7 +89,6 @@ mh-chart \- Chart of nmh Commands .RB [ \-form .IR formfile ] .RB [ \-annotate " | " \-noannotate ] -.RB [ \-inplace " | " \-noinplace ] .RB [ \-editor .IR editor ] .RB [ \-noedit ] @@ -180,7 +178,6 @@ is equivalent to .RB [ \-format " | " \-noformat ] .RB [ \-filter .IR filterfile ] -.RB [ \-inplace " | " \-noinplace ] .RB [ \-mime " | " \-nomime ] .RB [ \-editor .IR editor ] @@ -550,7 +547,6 @@ all/to/cc/me] .RB [ \-format " | " \-noformat ] .RB [ \-filter .IR filterfile ] -.RB [ \-inplace " | " \-noinplace ] .RB [ \-mime " | " \-nomime ] .RB [ \-fcc .IR +folder ] diff --git a/man/mh-profile.man5 b/man/mh-profile.man5 index d94f301..784e9c0 100644 --- a/man/mh-profile.man5 +++ b/man/mh-profile.man5 @@ -813,16 +813,6 @@ and if annotations are to occur. .RE .PP -.B $mhinplace -.RS 5 -This is set by -.BR dist , -.BR forw , -and -.B repl -if annotations are to occur. -.RE -.PP .B $mhfolder .RS 5 This is the folder containing the alternate message. diff --git a/man/repl.man1 b/man/repl.man1 index ed020c2..115e78f 100644 --- a/man/repl.man1 +++ b/man/repl.man1 @@ -22,7 +22,6 @@ all/to/cc/me] .RB [ \-format " | " \-noformat ] .RB [ \-filter .IR filterfile ] -.RB [ \-inplace " | " \-noinplace ] .RB [ \-mime " | " \-nomime ] .RB [ \-fcc .IR +folder ] @@ -302,11 +301,8 @@ If the message is not sent immediately from .BR repl , .RB \*(lq "comp\ \-use" \*(rq may be used to re\-edit and send the constructed -message, but the annotations won't take place. Normally annotations are -done inplace in order to preserve any links to the message. You may use -the -.B \-noinplace -switch to change this. +message, but the annotations won't take place. Annotations are always +done inplace in order to preserve any links to the message. .PP Although the default template specifies that a copy of the reply will be put in @@ -439,7 +435,6 @@ mhbuild(1), comp(1), forw(1), send(1), whatnow(1), mh\-format(5) .RB ` "\-nocc\ all" "' with `\-nogroup', `\-cc\ all' with `\-group'" .RB ` \-noannotate ' .RB ` \-noformat ' -.RB ` \-inplace ' .RB ` \-nomime ' .RB ` \-noquery ' .fi diff --git a/uip/anno.c b/uip/anno.c index 68d721a..aacd826 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -45,31 +45,27 @@ static struct swit switches[] = { #define COMPSW 0 { "component field", 0 }, -#define INPLSW 1 - { "inplace", 0 }, -#define NINPLSW 2 - { "noinplace", 0 }, -#define DATESW 3 +#define DATESW 1 { "date", 0 }, -#define NDATESW 4 +#define NDATESW 2 { "nodate", 0 }, -#define TEXTSW 5 +#define TEXTSW 3 { "text body", 0 }, -#define VERSIONSW 6 +#define VERSIONSW 4 { "version", 0 }, -#define HELPSW 7 +#define HELPSW 5 { "help", 0 }, -#define LISTSW 8 +#define LISTSW 6 { "list", 1 }, -#define DELETESW 9 +#define DELETESW 7 { "delete", 2 }, -#define NUMBERSW 10 +#define NUMBERSW 8 { "number", 2 }, -#define APPENDSW 11 +#define APPENDSW 9 { "append", 1 }, -#define PRESERVESW 12 +#define PRESERVESW 10 { "preserve", 1 }, -#define NOPRESERVESW 13 +#define NOPRESERVESW 11 { "nopreserve", 3 }, { NULL, 0 } }; @@ -83,7 +79,7 @@ static void make_comp(unsigned char **); int main(int argc, char **argv) { - int inplace = 1, datesw = 1; + int datesw = 1; int msgnum; char *cp, *maildir; unsigned char *comp = NULL; @@ -141,13 +137,6 @@ main(int argc, char **argv) datesw = 0; continue; - case INPLSW: - inplace++; - continue; - case NINPLSW: - inplace = 0; - continue; - case TEXTSW: if (text) adios(NULL, "only one body at a time!"); @@ -236,7 +225,7 @@ main(int argc, char **argv) if (list) annolist(m_name(msgnum), comp, text, number); else - annotate(m_name(msgnum), comp, text, inplace, datesw, delete, append); + annotate(m_name(msgnum), comp, text, datesw, delete, append); } } diff --git a/uip/annosbr.c b/uip/annosbr.c index e8c03e1..99422e6 100644 --- a/uip/annosbr.c +++ b/uip/annosbr.c @@ -17,7 +17,7 @@ /* ** static prototypes */ -static int annosbr(int, char *, char *, char *, int, int, int, int); +static int annosbr(int, char *, char *, char *, int, int, int); /* ** This "local" global and the annopreserve() function are a hack that @@ -29,7 +29,7 @@ static int annosbr(int, char *, char *, char *, int, int, int, int); static int preserve_actime_and_modtime = 0; int -annotate(char *file, char *comp, char *text, int inplace, int datesw, +annotate(char *file, char *comp, char *text, int datesw, int delete, int append) { int i, fd; @@ -57,7 +57,7 @@ annotate(char *file, char *comp, char *text, int inplace, int datesw, b.actime = s.st_atime; b.modtime = s.st_mtime; - i = annosbr(fd, file, comp, text, inplace, datesw, delete, append); + i = annosbr(fd, file, comp, text, datesw, delete, append); if (preserve_actime_and_modtime && utime(file, &b) == -1) advise("can't set access and modification times for %s", file); @@ -162,12 +162,12 @@ annopreserve(int preserve) } static int -annosbr(int fd, char *file, char *comp, char *text, int inplace, - int datesw, int delete, int append) +annosbr(int fd, char *file, char *comp, char *text, int datesw, int delete, + int append) { int mode, tmpfd; char *cp, *sp; - char buffer[BUFSIZ], tmpfil[BUFSIZ]; + char tmpfil[BUFSIZ]; struct stat st; FILE *tmp; int c; /* current character */ @@ -406,44 +406,23 @@ annosbr(int fd, char *file, char *comp, char *text, int inplace, cpydata(fd, fileno(tmp), file, tmpfil); fclose(tmp); - if (inplace) { - if ((tmpfd = open(tmpfil, O_RDONLY)) == NOTOK) - adios(tmpfil, "unable to open for re-reading"); + if ((tmpfd = open(tmpfil, O_RDONLY)) == NOTOK) + adios(tmpfil, "unable to open for re-reading"); - lseek(fd, (off_t) 0, SEEK_SET); + lseek(fd, (off_t) 0, SEEK_SET); - /* - ** We're making the file shorter if we're deleting a - ** header field so the file has to be truncated or it - ** will contain garbage. - */ - - if (delete >= -1 && ftruncate(fd, 0) == -1) - adios(tmpfil, "unable to truncate."); + /* + ** We're making the file shorter if we're deleting a + ** header field so the file has to be truncated or it + ** will contain garbage. + */ - cpydata(tmpfd, fd, tmpfil, file); - close(tmpfd); - unlink(tmpfil); - } else { - strncpy(buffer, m_backup(file), sizeof(buffer)); - if (rename(file, buffer) == NOTOK) { - switch (errno) { - case ENOENT: /* unlinked early - no annotations */ - unlink(tmpfil); - break; + if (delete >= -1 && ftruncate(fd, 0) == -1) + adios(tmpfil, "unable to truncate."); - default: - admonish(buffer, "unable to rename %s to", - file); - break; - } - return 1; - } - if (rename(tmpfil, file) == NOTOK) { - admonish(file, "unable to rename %s to", tmpfil); - return 1; - } - } + cpydata(tmpfd, fd, tmpfil, file); + close(tmpfd); + unlink(tmpfil); /* ** Close the delete file so that we don't run out of file pointers if diff --git a/uip/comp.c b/uip/comp.c index 7eee3f7..4536372 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -237,7 +237,7 @@ edit_it: if (nwhat) done(0); - what_now(ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd); + what_now(ed, nedit, use, drft, NULL, 0, NULLMP, NULL, cwd); done(1); return 1; } diff --git a/uip/dist.c b/uip/dist.c index 5739376..52e480e 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -21,19 +21,15 @@ static struct swit switches[] = { { "noedit", 0 }, #define FORMSW 4 { "form formfile", 0 }, -#define INPLSW 5 - { "inplace", 0 }, -#define NINPLSW 6 - { "noinplace", 0 }, -#define WHATSW 7 +#define WHATSW 5 { "whatnowproc program", 0 }, -#define NWHATSW 8 +#define NWHATSW 6 { "nowhatnowproc", 0 }, -#define VERSIONSW 9 +#define VERSIONSW 7 { "version", 0 }, -#define HELPSW 10 +#define HELPSW 8 { "help", 0 }, -#define FILESW 11 +#define FILESW 9 { "file file", -4 }, /* interface from msh */ { NULL, 0 } }; @@ -42,7 +38,7 @@ static struct swit switches[] = { int main(int argc, char **argv) { - int anot = 0, inplace = 1, nedit = 0; + int anot = 0, nedit = 0; int nwhat = 0, in, out; char *cp, *cwd, *maildir, *msgnam; char *ed = NULL, *file = NULL, *folder = NULL; @@ -118,13 +114,6 @@ main(int argc, char **argv) adios(NULL, "missing argument to %s", argp[-2]); continue; - - case INPLSW: - inplace++; - continue; - case NINPLSW: - inplace = 0; - continue; } } if (*cp == '+' || *cp == '@') { @@ -205,7 +194,7 @@ main(int argc, char **argv) if (nwhat) done(0); what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL, - inplace, cwd); + cwd); done(1); return 1; } diff --git a/uip/forw.c b/uip/forw.c index 9cdb793..44c32a0 100644 --- a/uip/forw.c +++ b/uip/forw.c @@ -33,33 +33,29 @@ static struct swit switches[] = { { "format", 5 }, #define NFRMTSW 7 { "noformat", 7 }, -#define INPLSW 8 - { "inplace", 0 }, -#define NINPLSW 9 - { "noinplace", 0 }, -#define MIMESW 10 +#define MIMESW 8 { "mime", 0 }, -#define NMIMESW 11 +#define NMIMESW 9 { "nomime", 0 }, -#define DGSTSW 12 +#define DGSTSW 10 { "digest list", 0 }, -#define ISSUESW 13 +#define ISSUESW 11 { "issue number", 0 }, -#define VOLUMSW 14 +#define VOLUMSW 12 { "volume number", 0 }, -#define WHATSW 15 +#define WHATSW 13 { "whatnowproc program", 0 }, -#define NWHATSW 16 +#define NWHATSW 14 { "nowhatnowproc", 0 }, -#define VERSIONSW 17 +#define VERSIONSW 15 { "version", 0 }, -#define HELPSW 18 +#define HELPSW 16 { "help", 0 }, -#define FILESW 19 +#define FILESW 17 { "file file", 4 }, /* interface from msh */ #ifdef MHE -#define BILDSW 22 +#define BILDSW 18 { "build", 5 }, /* interface from mhe */ #endif /* MHE */ @@ -88,7 +84,7 @@ static int build_form(char *, char *, int, int); int main(int argc, char **argv) { - int msgp = 0, anot = 0, inplace = 1, mime = 0; + int msgp = 0, anot = 0, mime = 0; int issue = 0, volume = 0; int nedit = 0, nwhat = 0, in; int out, msgnum; @@ -190,13 +186,6 @@ main(int argc, char **argv) filter = NULL; continue; - case INPLSW: - inplace++; - continue; - case NINPLSW: - inplace = 0; - continue; - case MIMESW: mime++; filter = NULL; @@ -359,7 +348,7 @@ main(int argc, char **argv) if (nwhat) done(0); what_now(ed, nedit, NOUSE, drft, NULL, 0, mp, - anot ? "Forwarded" : NULL, inplace, cwd); + anot ? "Forwarded" : NULL, cwd); done(1); return 1; } @@ -542,7 +531,7 @@ add_forw_hdr(char *draft) strncat(buffer, m_name(msgnum), sizeof(buffer)-strlen(buffer)-1); } - annotate(draft, attach_hdr, buffer, 1, 0, -2, 1); + annotate(draft, attach_hdr, buffer, 0, -2, 1); } diff --git a/uip/repl.c b/uip/repl.c index 6231d46..354bb79 100644 --- a/uip/repl.c +++ b/uip/repl.c @@ -37,31 +37,27 @@ static struct swit switches[] = { { "format", 5 }, #define NFRMTSW 12 { "noformat", 7 }, -#define INPLSW 13 - { "inplace", 0 }, -#define NINPLSW 14 - { "noinplace", 0 }, -#define MIMESW 15 +#define MIMESW 13 { "mime", 0 }, -#define NMIMESW 16 +#define NMIMESW 14 { "nomime", 0 }, -#define QURYSW 17 +#define QURYSW 15 { "query", 0 }, -#define NQURYSW 18 +#define NQURYSW 16 { "noquery", 0 }, -#define WHATSW 19 +#define WHATSW 17 { "whatnowproc program", 0 }, -#define NWHATSW 20 +#define NWHATSW 18 { "nowhatnowproc", 0 }, -#define VERSIONSW 21 +#define VERSIONSW 19 { "version", 0 }, -#define HELPSW 22 +#define HELPSW 20 { "help", 0 }, -#define FILESW 23 +#define FILESW 21 { "file file", 4 }, /* interface from msh */ #ifdef MHE -#define BILDSW 24 +#define BILDSW 22 { "build", 5 }, /* interface from mhe */ #endif @@ -102,7 +98,7 @@ void docc(char *, int); int main(int argc, char **argv) { - int anot = 0, inplace = 1; + int anot = 0; int nedit = 0, nwhat = 0; char *cp, *cwd, *dp, *maildir, *file = NULL; char *folder = NULL, *msg = NULL; @@ -238,13 +234,6 @@ main(int argc, char **argv) filter = NULL; continue; - case INPLSW: - inplace++; - continue; - case NINPLSW: - inplace = 0; - continue; - case MIMESW: mime++; filter = NULL; @@ -353,7 +342,7 @@ main(int argc, char **argv) if (nwhat) done(0); what_now(ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL, - inplace, cwd); + cwd); done(1); return 1; } diff --git a/uip/replsbr.c b/uip/replsbr.c index 907465e..fbf31c7 100644 --- a/uip/replsbr.c +++ b/uip/replsbr.c @@ -265,7 +265,7 @@ finished: snprintf(buffer, sizeof buffer, "+%s %s", mp->foldpath, m_name(mp->lowsel)); - annotate(drft, attach_hdr, buffer, 1, 0, -2, 1); + annotate(drft, attach_hdr, buffer, 0, -2, 1); } /* return dynamically allocated buffers */ diff --git a/uip/send.c b/uip/send.c index d52b9e3..3055df7 100644 --- a/uip/send.c +++ b/uip/send.c @@ -29,7 +29,6 @@ int debugsw = 0; /* global */ int forwsw = 1; -int inplace = 1; int pushsw = 0; int verbsw = 0; char *altmsg = NULL; @@ -260,9 +259,6 @@ main(int argc, char **argv) if (!(annotext = getenv("mhannotate")) || !*annotext) { annotext = NULL; } - if (annotext && ((cp = getenv("mhinplace")) && *cp)) { - inplace = atoi(cp); - } if (!(altmsg = getenv("mhaltmsg")) || !*altmsg) { altmsg = NULL; /* used by dist interface - see below */ } @@ -927,16 +923,14 @@ annoaux(void) } if (debugsw) { - advise(NULL, "annotate%s as `%s'", inplace ? " inplace" : "", - annotext); + advise(NULL, "annotate as `%s'", annotext); } for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { if (debugsw) { advise(NULL, "annotate message %d", msgnum); } - annotate(m_name(msgnum), annotext, NULL, inplace, - 1, -2, 0); + annotate(m_name(msgnum), annotext, NULL, 1, -2, 0); } } diff --git a/uip/whatnow.c b/uip/whatnow.c index b081900..5b59c86 100644 --- a/uip/whatnow.c +++ b/uip/whatnow.c @@ -383,13 +383,13 @@ main(int argc, char **argv) if (*shell == '/') annotate(drft, attach_hdr, - shell, 1, 0, + shell, 0, -2, 1); else { sprintf(file, "%s/%s", cwd, shell); annotate(drft, attach_hdr, - file, 1, 0, + file, 0, -2, 1); } } @@ -437,7 +437,7 @@ main(int argc, char **argv) if (**arguments != '\0') { n = atoi(*arguments); annotate(drft, attach_hdr, - NULL, 1, 0, + NULL, 0, n, 1); for (argp = arguments + 1; *argp != NULL; argp++) { @@ -470,7 +470,7 @@ main(int argc, char **argv) != NULL) { *(strchr(shell, '\n')) = '\0'; annotate(drft, attach_hdr, shell, - 1, 0, 0, 1); + 0, 0, 1); } pclose(f); } else { diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c index 12cd13a..1b16e5d 100644 --- a/uip/whatnowproc.c +++ b/uip/whatnowproc.c @@ -17,7 +17,7 @@ */ int what_now(char *ed, int nedit, int use, char *file, char *altmsg, int dist, - struct msgs *mp, char *text, int inplace, char *cwd) + struct msgs *mp, char *text, char *cwd) { int found, k, msgnum, vecp; int len, buflen; @@ -59,7 +59,6 @@ what_now(char *ed, int nedit, int use, char *file, char *altmsg, int dist, unputenv("mhmessages"); unputenv("mhannotate"); - unputenv("mhinplace"); if (text && mp && !is_readonly(mp)) { found = 0; @@ -87,8 +86,6 @@ what_now(char *ed, int nedit, int use, char *file, char *altmsg, int dist, if (found) { m_putenv("mhmessages", buffer); m_putenv("mhannotate", text); - snprintf(buffer, sizeof(buffer), "%d", inplace); - m_putenv("mhinplace", buffer); } }