Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package alpine for openSUSE:Factory checked in at 2021-06-01 10:35:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alpine (Old) and /work/SRC/openSUSE:Factory/.alpine.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alpine" Tue Jun 1 10:35:44 2021 rev:53 rq:895372 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/alpine/alpine.changes 2021-05-21 21:50:40.462069871 +0200 +++ /work/SRC/openSUSE:Factory/.alpine.new.1898/alpine.changes 2021-06-01 10:36:25.884707797 +0200 @@ -1,0 +2,5 @@ +Tue May 25 11:44:38 UTC 2021 - Jan Engelhardt <[email protected]> + +- Add chappa-DelText.patch [boo#1182236] + +------------------------------------------------------------------- New: ---- chappa-DelText.patch chappa-DelText.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alpine.spec ++++++ --- /var/tmp/diff_new_pack.709WwB/_old 2021-06-01 10:36:26.536708908 +0200 +++ /var/tmp/diff_new_pack.709WwB/_new 2021-06-01 10:36:26.540708914 +0200 @@ -61,6 +61,8 @@ Patch615: chappa-fromheader.patch Source616: chappa-rules.txt Patch616: chappa-rules.patch +Source617: chappa-DelText.txt +Patch617: chappa-DelText.patch BuildRequires: autoconf >= 2.69 BuildRequires: krb5-devel BuildRequires: libtool @@ -132,6 +134,7 @@ %patch614 -p1 %patch615 -p1 %patch616 -p1 +%patch617 -p1 # # SuSE patches - warning fixes, etc: # ++++++ UPDATING.txt ++++++ --- /var/tmp/diff_new_pack.709WwB/_old 2021-06-01 10:36:26.588708996 +0200 +++ /var/tmp/diff_new_pack.709WwB/_new 2021-06-01 10:36:26.588708996 +0200 @@ -5,9 +5,11 @@ release, the OOT patches on the website get updated too. version="2.24" - for i in WrtAcc colortext fancy fillpara fromheader insertpat maildir rules; do + for i in WrtAcc colortext fancy fillpara fromheader insertpat maildir rules DelText; do wget -O- "http://alpine.x10host.com/alpine/patches/alpine-$version/$i.patch.gz"; | gzip -cd >"chappa-$i.patch"; done These do not necessarily apply cleanly, so they also need to be quilt-refreshed as needed. + +fillpara is known to collide with DelText. ++++++ chappa-DelText.patch ++++++ --- pico/basic.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ pico/efunc.h | 1 + pico/search.c | 8 ++++++-- 3 files changed, 57 insertions(+), 2 deletions(-) Index: alpine-2.24/pico/basic.c =================================================================== --- alpine-2.24.orig/pico/basic.c +++ alpine-2.24/pico/basic.c @@ -959,7 +959,57 @@ scrolldownline(int f, int n) return (scrollforw (1, FALSE)); } +/* deltext deletes from the specified position until the end of the file + * or until the signature (when called from Pine), whichever comes first. + */ +int +deltext (f,n) +int f,n; +{ + LINE *currline = curwp->w_dotp; + static int firsttime = 0; + + if ((lastflag&CFKILL) == 0) + kdelete(); + + curwp->w_markp = curwp->w_dotp; + curwp->w_marko = curwp->w_doto; + + while (curwp->w_dotp != curbp->b_linep){ + if ((Pmaster) + && (llength(curwp->w_dotp) == 3) + && (lgetc(curwp->w_dotp, 0).c == '-') + && (lgetc(curwp->w_dotp, 1).c == '-') + && (lgetc(curwp->w_dotp, 2).c == ' ')){ + if (curwp->w_dotp == currline){ + if (curwp->w_doto) + curwp->w_dotp = lforw(curwp->w_dotp); + else + break; + } + else{ + curwp->w_dotp = lback(curwp->w_dotp); + curwp->w_doto = llength(curwp->w_dotp); + break; + } + } + else{ + if(lforw(curwp->w_dotp) != curbp->b_linep) + curwp->w_dotp = lforw(curwp->w_dotp); + else{ + curwp->w_doto = llength(curwp->w_dotp); + break; + } + } + } + killregion(FALSE,1); + lastflag |= CFKILL; + if(firsttime == 0) + emlwrite("Deleted text can be recovered with the ^U command", NULL); + firsttime = 1; + return TRUE; +} /* * Scroll to a position. Index: alpine-2.24/pico/efunc.h =================================================================== --- alpine-2.24.orig/pico/efunc.h +++ alpine-2.24/pico/efunc.h @@ -59,6 +59,7 @@ extern unsigned char accent(UCS, UCS); extern unsigned char GetAccent(void); extern int forwpage(int, int); extern int backpage(int, int); +extern int deltext (int, int); extern int scrollupline(int, int); extern int scrolldownline(int, int); extern int scrollto(int, int); Index: alpine-2.24/pico/search.c =================================================================== --- alpine-2.24.orig/pico/search.c +++ alpine-2.24/pico/search.c @@ -73,7 +73,7 @@ EXTRAKEYS menu_srchpat[] = { {"^O", N_("End of Para"), (CTRL|'O')}, {"^U", N_("FullJustify"), (CTRL|'U')}, {"^P", N_("Delete Para"), (CTRL|'P')}, - {NULL, NULL, 0} + {"^X", N_("Del End"), (CTRL|'X')}, }; #define EXACTSR_KEY 1 /* toggle an exact or approximate search */ @@ -286,7 +286,11 @@ forwsearch(int f, int n) break; case (CTRL|'X'): - if(flags & SR_OPTNMEN){ + if (flags & SR_ORIGMEN){ + deltext(f,n); + FWS_RETURN(TRUE); + } + else if(flags & SR_OPTNMEN){ if (flags & SR_NOEXACT){ flags &= ~SR_NOEXACT; flags |= SR_EXACTSR; ++++++ chappa-DelText.txt ++++++ From: http://alpine.x10host.com/alpine/info/DelText.html Upstream: constitutes upstream source, delivered in non-tarball form This patch allows Pico and Alpine to remove all text of the message from the position of the cursor up to the end of the file or message. All you need to do is to press ^W ^X. If your signature is delimited by the string "-- " (two dashes and a space), it will not be erased by this command.
