From 908ce36199f71770a6e6f15f0bac47825263d6eef1af49afe2ac014dc200bec6 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 8 Sep 2020 20:48:40 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/alpine revision 48.0 OBS-URL: https://build.opensuse.org/package/show/server:mail/alpine?expand=0&rev=602b33aa6345899706ba2ef2a818d031 --- alpine-2.22.tar.xz | 3 - alpine-2.23.tar.xz | 3 + alpine.changes | 12 + alpine.spec | 15 +- chappa-WrtAcc.patch | 36 +- chappa-colortext.patch | 132 +++---- chappa-fancy.patch | 371 ++++++++++---------- chappa-fillpara.patch | 248 +++++++------- chappa-fromheader.patch | 56 +-- chappa-insertpat.patch | 12 +- chappa-maildir.patch | 190 +++++----- chappa-rules.patch | 476 +++++++++++++++----------- extern.diff | 22 -- pico-fix-spurious-undef-warnings.diff | 28 +- 14 files changed, 827 insertions(+), 777 deletions(-) delete mode 100644 alpine-2.22.tar.xz create mode 100644 alpine-2.23.tar.xz delete mode 100644 extern.diff diff --git a/alpine-2.22.tar.xz b/alpine-2.22.tar.xz deleted file mode 100644 index 45f6051..0000000 --- a/alpine-2.22.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:849567c1b6f71fde3aaa1c97cf0577b12a525d9e22c0ea47797c4bf1cd2bbfdb -size 6336604 diff --git a/alpine-2.23.tar.xz b/alpine-2.23.tar.xz new file mode 100644 index 0000000..ec73d11 --- /dev/null +++ b/alpine-2.23.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:793a61215c005b5fcffb48f642f125915276b7ec7827508dd9e83d4c4da91f7b +size 6330784 diff --git a/alpine.changes b/alpine.changes index 4801c2d..9c42941 100644 --- a/alpine.changes +++ b/alpine.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Sep 7 13:44:51 UTC 2020 - Jan Engelhardt + +- Update to release 2.23 + * Implementation of XOAUTH2 authentication support for Outlook. + * Add support for the OAUTHBEARER authentication method in Gmail. + * Support for the SASL-IR IMAP extension. + * Alpine can pass an HTML message to an external web browser, + by using the "External" command in the ATTACHMENT INDEX + screen. +- Drop extern.diff (merged) + ------------------------------------------------------------------- Sun Jun 7 10:48:05 UTC 2020 - Jan Engelhardt diff --git a/alpine.spec b/alpine.spec index 456e067..a30196c 100644 --- a/alpine.spec +++ b/alpine.spec @@ -19,16 +19,15 @@ Name: alpine # For debugging only: %define build_vanilla 0 +Version: 2.23 +Release: 0 Summary: Mail User Agent License: Apache-2.0 Group: Productivity/Networking/Email/Clients -Version: 2.22 -Release: 0 URL: http://alpine.x10host.com/alpine/ # direct download does not work for openSUSE:Factory -# Source: http://patches.freeiz.com/alpine/release/src/%name-%version.tar.xz -Source: %name-%version.tar.xz +Source: http://alpine.x10host.com/alpine/release/src/%name-%version.tar.xz Source1: %name.png Source2: %name.desktop Source9: UPDATING.txt @@ -41,7 +40,6 @@ Patch10: pico-fix-spurious-undef-warnings.diff Patch20: pine-expression-warnings.diff Patch60: signal-and-panic-improvements.diff Patch61: return-values.diff -Patch62: extern.diff # # Eduardo Chappa's patches. # http://patches.freeiz.com/alpine/ @@ -110,7 +108,7 @@ the bottom of the screen, and context-sensitive help is provided. %prep %setup -q -%if !%{build_vanilla} +%if !0%{?build_vanilla} # # This is here to support checking if any patches add new warnings: # @@ -145,8 +143,7 @@ fi %patch20 -p1 %patch60 -p1 %patch61 -p1 -%patch62 -p1 -%endif # End of "if !{build_vanilla}" +%endif %build # @@ -202,7 +199,7 @@ perl -i -pe 's{(define SYSTYPE) "LNX"}{$1 "'"$tag"'"}g' include/config.h # # imap does not use CFLAGS from configure, needs EXTRACFLAGS/EXTRALDFLAGS: # -make %{?_smp_mflags} EXTRACFLAGS="$CFLAGS" EXTRALDFLAGS="$EXTRALDFLAGS" +%make_build EXTRACFLAGS="$CFLAGS" EXTRALDFLAGS="$EXTRALDFLAGS" %install %make_install diff --git a/chappa-WrtAcc.patch b/chappa-WrtAcc.patch index c60cd36..52270e6 100644 --- a/chappa-WrtAcc.patch +++ b/chappa-WrtAcc.patch @@ -1,6 +1,6 @@ -diff -rc alpine-2.22/pico/basic.c alpine-2.22.WrtAcc/pico/basic.c -*** alpine-2.22/pico/basic.c 2020-01-19 01:32:18.272513938 -0700 ---- alpine-2.22.WrtAcc/pico/basic.c 2020-01-19 01:34:53.223471368 -0700 +diff -rc alpine-2.23/pico/basic.c alpine-2.23.WrtAcc/pico/basic.c +*** alpine-2.23/pico/basic.c 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.WrtAcc/pico/basic.c 2020-06-18 16:08:12.541589518 -0600 *************** *** 342,347 **** --- 342,530 ---- @@ -193,9 +193,9 @@ diff -rc alpine-2.22/pico/basic.c alpine-2.22.WrtAcc/pico/basic.c /* * go forword to the end of the current paragraph -diff -rc alpine-2.22/pico/composer.c alpine-2.22.WrtAcc/pico/composer.c -*** alpine-2.22/pico/composer.c 2020-01-19 01:32:18.262514139 -0700 ---- alpine-2.22.WrtAcc/pico/composer.c 2020-01-19 01:34:53.224471360 -0700 +diff -rc alpine-2.23/pico/composer.c alpine-2.23.WrtAcc/pico/composer.c +*** alpine-2.23/pico/composer.c 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.WrtAcc/pico/composer.c 2020-06-18 16:08:12.545589528 -0600 *************** *** 2015,2021 **** tbufp = &strng[ods.p_len]; @@ -229,9 +229,9 @@ diff -rc alpine-2.22/pico/composer.c alpine-2.22.WrtAcc/pico/composer.c case (CTRL|KEY_LEFT): /* word skip left */ if(ods.p_ind > 0) /* Scoot one char left if possible */ ods.p_ind--; -diff -rc alpine-2.22/pico/display.c alpine-2.22.WrtAcc/pico/display.c -*** alpine-2.22/pico/display.c 2020-01-19 01:32:18.428510798 -0700 ---- alpine-2.22.WrtAcc/pico/display.c 2020-01-19 01:34:53.225471353 -0700 +diff -rc alpine-2.23/pico/display.c alpine-2.23.WrtAcc/pico/display.c +*** alpine-2.23/pico/display.c 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.WrtAcc/pico/display.c 2020-06-18 16:08:12.545589528 -0600 *************** *** 2196,2201 **** --- 2196,2206 ---- @@ -263,9 +263,9 @@ diff -rc alpine-2.22/pico/display.c alpine-2.22.WrtAcc/pico/display.c /* look for match in extra_v */ for(i = 0; i < 12; i++) if(c && c == extra_v[i]){ -diff -rc alpine-2.22/pico/ebind.h alpine-2.22.WrtAcc/pico/ebind.h -*** alpine-2.22/pico/ebind.h 2020-01-19 01:32:18.369511986 -0700 ---- alpine-2.22.WrtAcc/pico/ebind.h 2020-01-19 01:34:53.226471345 -0700 +diff -rc alpine-2.23/pico/ebind.h alpine-2.23.WrtAcc/pico/ebind.h +*** alpine-2.23/pico/ebind.h 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.WrtAcc/pico/ebind.h 2020-06-18 16:08:12.545589528 -0600 *************** *** 61,67 **** #ifdef MOUSE @@ -319,9 +319,9 @@ diff -rc alpine-2.22/pico/ebind.h alpine-2.22.WrtAcc/pico/ebind.h #endif #endif {CTRL|'A', gotobol}, -diff -rc alpine-2.22/pico/efunc.h alpine-2.22.WrtAcc/pico/efunc.h -*** alpine-2.22/pico/efunc.h 2020-01-19 01:32:18.308513213 -0700 ---- alpine-2.22.WrtAcc/pico/efunc.h 2020-01-19 01:34:53.226471345 -0700 +diff -rc alpine-2.23/pico/efunc.h alpine-2.23.WrtAcc/pico/efunc.h +*** alpine-2.23/pico/efunc.h 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.WrtAcc/pico/efunc.h 2020-06-18 16:08:12.545589528 -0600 *************** *** 54,59 **** --- 54,62 ---- @@ -334,9 +334,9 @@ diff -rc alpine-2.22/pico/efunc.h alpine-2.22.WrtAcc/pico/efunc.h extern int forwpage(int, int); extern int backpage(int, int); extern int scrollupline(int, int); -diff -rc alpine-2.22/pico/main.c alpine-2.22.WrtAcc/pico/main.c -*** alpine-2.22/pico/main.c 2020-01-19 01:32:18.322512932 -0700 ---- alpine-2.22.WrtAcc/pico/main.c 2020-01-19 01:34:53.226471345 -0700 +diff -rc alpine-2.23/pico/main.c alpine-2.23.WrtAcc/pico/main.c +*** alpine-2.23/pico/main.c 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.WrtAcc/pico/main.c 2020-06-18 16:08:12.545589528 -0600 *************** *** 458,463 **** --- 458,469 ---- diff --git a/chappa-colortext.patch b/chappa-colortext.patch index a48871d..b6c157b 100644 --- a/chappa-colortext.patch +++ b/chappa-colortext.patch @@ -1,9 +1,9 @@ -diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.colortext/alpine/confscroll.c -*** alpine-2.22/alpine/confscroll.c 2020-01-19 01:32:20.190475483 -0700 ---- alpine-2.22.colortext/alpine/confscroll.c 2020-01-19 01:34:56.906444203 -0700 +diff -rc alpine-2.23/alpine/confscroll.c alpine-2.23.colortext/alpine/confscroll.c +*** alpine-2.23/alpine/confscroll.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.colortext/alpine/confscroll.c 2020-06-18 16:08:14.821595407 -0600 *************** -*** 5228,5233 **** ---- 5228,5236 ---- +*** 5227,5232 **** +--- 5227,5235 ---- clear_index_cache(ps->mail_stream, 0); } @@ -13,12 +13,12 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.colortext/alpine/confscroll else if(var == &ps->vars[V_INIT_CMD_LIST]){ if(!revert) q_status_message(SM_ASYNC, 0, 3, -diff -rc alpine-2.22/pith/conf.c alpine-2.22.colortext/pith/conf.c -*** alpine-2.22/pith/conf.c 2020-01-19 01:32:18.678505766 -0700 ---- alpine-2.22.colortext/pith/conf.c 2020-01-19 01:34:56.908444189 -0700 +diff -rc alpine-2.23/pith/conf.c alpine-2.23.colortext/pith/conf.c +*** alpine-2.23/pith/conf.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.colortext/pith/conf.c 2020-06-18 16:08:14.821595407 -0600 *************** -*** 231,236 **** ---- 231,238 ---- +*** 233,238 **** +--- 233,240 ---- CONF_TXT_T cf_text_fillcol[] = "Specifies the column of the screen where the composer should wrap."; @@ -28,8 +28,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.colortext/pith/conf.c CONF_TXT_T cf_text_quotereplstr[] = "Specifies the string to replace quotes with when viewing a message."; *************** -*** 577,582 **** ---- 579,586 ---- +*** 583,588 **** +--- 585,592 ---- #endif /* _WINDOWS */ {"composer-wrap-column", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_fillcol}, @@ -39,8 +39,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.colortext/pith/conf.c NULL, cf_text_replystr}, {"reply-leadin", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, *************** -*** 844,849 **** ---- 848,855 ---- +*** 856,861 **** +--- 860,867 ---- {"incoming-unseen-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"signature-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"signature-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, @@ -50,8 +50,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.colortext/pith/conf.c {"prompt-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"header-general-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, *************** -*** 2035,2040 **** ---- 2041,2048 ---- +*** 2057,2062 **** +--- 2063,2070 ---- set_current_val(&vars[V_DICTIONARY], TRUE, TRUE); #endif /* _WINDOWS */ set_current_val(&vars[V_IMAGE_VIEWER], TRUE, TRUE); @@ -61,8 +61,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.colortext/pith/conf.c set_current_val(&vars[V_HISTORY], TRUE, TRUE); set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE); *************** -*** 6599,6604 **** ---- 6607,6613 ---- +*** 6623,6628 **** +--- 6631,6637 ---- set_color_val(&vars[V_IND_OP_FORE_COLOR], 0); set_color_val(&vars[V_INCUNSEEN_FORE_COLOR], 0); set_color_val(&vars[V_SIGNATURE_FORE_COLOR], 0); @@ -71,8 +71,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.colortext/pith/conf.c set_current_val(&ps->vars[V_INDEX_TOKEN_COLORS], TRUE, TRUE); set_current_val(&ps->vars[V_VIEW_HDR_COLORS], TRUE, TRUE); *************** -*** 7787,7792 **** ---- 7796,7803 ---- +*** 7841,7846 **** +--- 7850,7857 ---- return(h_config_scroll_margin); case V_DEADLETS : return(h_config_deadlets); @@ -82,8 +82,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.colortext/pith/conf.c return(h_config_composer_wrap_column); case V_TCPOPENTIMEO : *************** -*** 7956,7961 **** ---- 7967,7975 ---- +*** 8020,8025 **** +--- 8031,8039 ---- case V_SIGNATURE_FORE_COLOR : case V_SIGNATURE_BACK_COLOR : return(h_config_signature_color); @@ -93,12 +93,12 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.colortext/pith/conf.c case V_PROMPT_FORE_COLOR : case V_PROMPT_BACK_COLOR : return(h_config_prompt_color); -diff -rc alpine-2.22/pith/conf.h alpine-2.22.colortext/pith/conf.h -*** alpine-2.22/pith/conf.h 2020-01-19 01:32:19.489489496 -0700 ---- alpine-2.22.colortext/pith/conf.h 2020-01-19 01:34:56.909444181 -0700 +diff -rc alpine-2.23/pith/conf.h alpine-2.23.colortext/pith/conf.h +*** alpine-2.23/pith/conf.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.colortext/pith/conf.h 2020-06-18 16:08:14.821595407 -0600 *************** -*** 165,170 **** ---- 165,172 ---- +*** 171,176 **** +--- 171,178 ---- #define VAR_DICTIONARY vars[V_DICTIONARY].current_val.l #define GLO_DICTIONARY vars[V_DICTIONARY].global_val.l #endif /* _WINDOWS */ @@ -108,8 +108,8 @@ diff -rc alpine-2.22/pith/conf.h alpine-2.22.colortext/pith/conf.h #define GLO_FILLCOL vars[V_FILLCOL].global_val.p #define VAR_DEADLETS vars[V_DEADLETS].current_val.p *************** -*** 466,471 **** ---- 468,475 ---- +*** 472,477 **** +--- 474,481 ---- #define GLO_SIGNATURE_FORE_COLOR vars[V_SIGNATURE_FORE_COLOR].global_val.p #define VAR_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].current_val.p #define GLO_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].global_val.p @@ -118,9 +118,9 @@ diff -rc alpine-2.22/pith/conf.h alpine-2.22.colortext/pith/conf.h #define VAR_PROMPT_FORE_COLOR vars[V_PROMPT_FORE_COLOR].current_val.p #define VAR_PROMPT_BACK_COLOR vars[V_PROMPT_BACK_COLOR].current_val.p #define VAR_VIEW_HDR_COLORS vars[V_VIEW_HDR_COLORS].current_val.l -diff -rc alpine-2.22/pith/conftype.h alpine-2.22.colortext/pith/conftype.h -*** alpine-2.22/pith/conftype.h 2020-01-19 01:32:18.702505283 -0700 ---- alpine-2.22.colortext/pith/conftype.h 2020-01-19 01:34:56.910444174 -0700 +diff -rc alpine-2.23/pith/conftype.h alpine-2.23.colortext/pith/conftype.h +*** alpine-2.23/pith/conftype.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.colortext/pith/conftype.h 2020-06-18 16:08:14.821595407 -0600 *************** *** 83,88 **** --- 83,89 ---- @@ -132,8 +132,8 @@ diff -rc alpine-2.22/pith/conftype.h alpine-2.22.colortext/pith/conftype.h , V_REPLY_INTRO , V_QUOTE_REPLACE_STRING *************** -*** 238,243 **** ---- 239,246 ---- +*** 243,248 **** +--- 244,251 ---- , V_INCUNSEEN_BACK_COLOR , V_SIGNATURE_FORE_COLOR , V_SIGNATURE_BACK_COLOR @@ -142,9 +142,9 @@ diff -rc alpine-2.22/pith/conftype.h alpine-2.22.colortext/pith/conftype.h , V_PROMPT_FORE_COLOR , V_PROMPT_BACK_COLOR , V_HEADER_GENERAL_FORE_COLOR -diff -rc alpine-2.22/pith/mailview.c alpine-2.22.colortext/pith/mailview.c -*** alpine-2.22/pith/mailview.c 2020-01-19 01:32:18.803503250 -0700 ---- alpine-2.22.colortext/pith/mailview.c 2020-01-19 01:34:56.911444167 -0700 +diff -rc alpine-2.23/pith/mailview.c alpine-2.23.colortext/pith/mailview.c +*** alpine-2.23/pith/mailview.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.colortext/pith/mailview.c 2020-06-18 16:08:14.821595407 -0600 *************** *** 638,643 **** --- 638,651 ---- @@ -355,9 +355,9 @@ diff -rc alpine-2.22/pith/mailview.c alpine-2.22.colortext/pith/mailview.c /* * The argument fieldname is something like "Subject:..." or "Subject". -diff -rc alpine-2.22/pith/mailview.h alpine-2.22.colortext/pith/mailview.h -*** alpine-2.22/pith/mailview.h 2020-01-19 01:32:19.614486993 -0700 ---- alpine-2.22.colortext/pith/mailview.h 2020-01-19 01:34:56.911444167 -0700 +diff -rc alpine-2.23/pith/mailview.h alpine-2.23.colortext/pith/mailview.h +*** alpine-2.23/pith/mailview.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.colortext/pith/mailview.h 2020-06-18 16:08:14.821595407 -0600 *************** *** 30,35 **** --- 30,41 ---- @@ -391,12 +391,12 @@ diff -rc alpine-2.22/pith/mailview.h alpine-2.22.colortext/pith/mailview.h /* * BUG: BELOW IS UNIX/PC ONLY since config'd browser means nothing to webpine -diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.colortext/pith/pine.hlp -*** alpine-2.22/pith/pine.hlp 2020-01-19 01:32:19.035498584 -0700 ---- alpine-2.22.colortext/pith/pine.hlp 2020-01-19 01:34:56.924444072 -0700 +diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.colortext/pith/pine.hlp +*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.colortext/pith/pine.hlp 2020-06-18 16:08:14.825595417 -0600 *************** -*** 4601,4606 **** ---- 4601,4607 ---- +*** 4683,4688 **** +--- 4683,4689 ----
  • OPTION:
  • OPTION:
  • OPTION: @@ -405,8 +405,8 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.colortext/pith/pine.hlp
  • OPTION: Print-Font-Char-Set
  • OPTION: Print-Font-Name *************** -*** 4629,4634 **** ---- 4630,4636 ---- +*** 4711,4716 **** +--- 4712,4718 ----
  • OPTION:
  • OPTION:
  • OPTION: Signature Color @@ -415,8 +415,8 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.colortext/pith/pine.hlp
  • OPTION:
  • OPTION: *************** -*** 24262,24267 **** ---- 24264,24306 ---- +*** 24379,24384 **** +--- 24381,24423 ---- <End of help on this topic> @@ -461,8 +461,8 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.colortext/pith/pine.hlp *************** -*** 32864,32869 **** ---- 32903,32932 ---- +*** 33000,33005 **** +--- 33039,33068 ----

    Descriptions of the available commands @@ -493,14 +493,14 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.colortext/pith/pine.hlp

    Look here to see the available Editing and Navigation commands. -diff -rc alpine-2.22/pith/state.c alpine-2.22.colortext/pith/state.c -*** alpine-2.22/pith/state.c 2020-01-19 01:32:18.700505323 -0700 ---- alpine-2.22.colortext/pith/state.c 2020-01-19 01:34:56.926444057 -0700 +diff -rc alpine-2.23/pith/state.c alpine-2.23.colortext/pith/state.c +*** alpine-2.23/pith/state.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.colortext/pith/state.c 2020-06-18 16:08:14.825595417 -0600 *************** -*** 138,143 **** ---- 138,146 ---- - if((*pps)->folders_dir != NULL) - fs_give((void **)&(*pps)->folders_dir); +*** 144,149 **** +--- 144,152 ---- + if((*pps)->html_dir_list != NULL) + free_html_log(&(*pps)->html_dir_list); + if((*pps)->paterror == 0) + regfree(&(*pps)->colorpat); @@ -508,12 +508,12 @@ diff -rc alpine-2.22/pith/state.c alpine-2.22.colortext/pith/state.c if((*pps)->ui.homedir) fs_give((void **)&(*pps)->ui.homedir); -diff -rc alpine-2.22/pith/state.h alpine-2.22.colortext/pith/state.h -*** alpine-2.22/pith/state.h 2020-01-19 01:32:18.561508121 -0700 ---- alpine-2.22.colortext/pith/state.h 2020-01-19 01:34:56.926444057 -0700 +diff -rc alpine-2.23/pith/state.h alpine-2.23.colortext/pith/state.h +*** alpine-2.23/pith/state.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.colortext/pith/state.h 2020-06-18 16:08:14.825595417 -0600 *************** -*** 340,345 **** ---- 340,347 ---- +*** 347,352 **** +--- 347,354 ---- char *display_charmap; /* needs to be freed */ char *keyboard_charmap; /* needs to be freed */ void *input_cs; @@ -522,9 +522,9 @@ diff -rc alpine-2.22/pith/state.h alpine-2.22.colortext/pith/state.h char *posting_charmap; /* needs to be freed */ -diff -rc alpine-2.22/pith/text.c alpine-2.22.colortext/pith/text.c -*** alpine-2.22/pith/text.c 2020-01-19 01:32:19.317492939 -0700 ---- alpine-2.22.colortext/pith/text.c 2020-01-19 01:34:56.927444050 -0700 +diff -rc alpine-2.23/pith/text.c alpine-2.23.colortext/pith/text.c +*** alpine-2.23/pith/text.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.colortext/pith/text.c 2020-06-18 16:08:14.825595417 -0600 *************** *** 171,176 **** --- 171,185 ---- diff --git a/chappa-fancy.patch b/chappa-fancy.patch index 4abb240..a3e06d9 100644 --- a/chappa-fancy.patch +++ b/chappa-fancy.patch @@ -1,6 +1,6 @@ -diff -rc alpine-2.22/alpine/arg.c alpine-2.22.fancy/alpine/arg.c -*** alpine-2.22/alpine/arg.c 2020-01-19 01:32:20.509469132 -0700 ---- alpine-2.22.fancy/alpine/arg.c 2020-01-19 01:34:41.241565376 -0700 +diff -rc alpine-2.23/alpine/arg.c alpine-2.23.fancy/alpine/arg.c +*** alpine-2.23/alpine/arg.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fancy/alpine/arg.c 2020-06-18 16:08:07.149575591 -0600 *************** *** 68,73 **** --- 68,74 ---- @@ -51,9 +51,9 @@ diff -rc alpine-2.22/alpine/arg.c alpine-2.22.fancy/alpine/arg.c else if(strcmp(*av, "url") == 0){ if(args->action == aaFolder && !args->data.folder){ args->action = aaURL; -diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c -*** alpine-2.22/alpine/confscroll.c 2020-01-19 01:32:20.190475483 -0700 ---- alpine-2.22.fancy/alpine/confscroll.c 2020-01-19 01:34:41.248565318 -0700 +diff -rc alpine-2.23/alpine/confscroll.c alpine-2.23.fancy/alpine/confscroll.c +*** alpine-2.23/alpine/confscroll.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fancy/alpine/confscroll.c 2020-06-18 16:08:07.149575591 -0600 *************** *** 139,145 **** char *radio_pretty_value(struct pine *, CONF_S *); @@ -90,7 +90,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c (*cl)->var == startup_ptr))) return; *************** -*** 2938,2944 **** +*** 2937,2943 **** } set_current_val((*cl)->var, TRUE, TRUE); @@ -98,7 +98,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c ps->def_sort = def_sort; ps->def_sort_rev = def_sort_rev; } ---- 2939,2945 ---- +--- 2938,2944 ---- } set_current_val((*cl)->var, TRUE, TRUE); @@ -107,8 +107,8 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c ps->def_sort_rev = def_sort_rev; } *************** -*** 2947,2952 **** ---- 2948,2984 ---- +*** 2946,2951 **** +--- 2947,2983 ---- ps->mangled_body = 1; /* BUG: redraw it all for now? */ rv = 1; } @@ -147,7 +147,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c q_status_message(SM_ORDER | SM_DING, 3, 6, "Programmer botch! Unknown radiobutton type."); *************** -*** 3810,3816 **** +*** 3809,3815 **** else if(standard_radio_var(ps, v) || v == startup_ptr) return(radio_pretty_value(ps, cl)); else if(v == &ps->vars[V_SORT_KEY]) @@ -155,7 +155,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c else if(v == &ps->vars[V_SIGNATURE_FILE]) return(sigfile_pretty_value(ps, cl)); else if(v == &ps->vars[V_USE_ONLY_DOMAIN_NAME]) ---- 3842,3850 ---- +--- 3841,3849 ---- else if(standard_radio_var(ps, v) || v == startup_ptr) return(radio_pretty_value(ps, cl)); else if(v == &ps->vars[V_SORT_KEY]) @@ -166,7 +166,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c return(sigfile_pretty_value(ps, cl)); else if(v == &ps->vars[V_USE_ONLY_DOMAIN_NAME]) *************** -*** 4341,4354 **** +*** 4340,4353 **** char * @@ -181,7 +181,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c { char tmp[6*MAXPATH]; char *pvalnorm, *pvalexc, *pval; ---- 4375,4388 ---- +--- 4374,4387 ---- char * @@ -197,7 +197,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c char tmp[6*MAXPATH]; char *pvalnorm, *pvalexc, *pval; *************** -*** 4398,4404 **** +*** 4397,4403 **** } else if(fixed){ pval = v->fixed_val.p; @@ -205,7 +205,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c is_the_one = (var_sort_rev == line_sort_rev && var_sort == line_sort); utf8_snprintf(tmp, sizeof(tmp), "(%c) %s%-*w%*s%s", ---- 4432,4438 ---- +--- 4431,4437 ---- } else if(fixed){ pval = v->fixed_val.p; @@ -214,7 +214,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c utf8_snprintf(tmp, sizeof(tmp), "(%c) %s%-*w%*s%s", *************** -*** 4409,4417 **** +*** 4408,4416 **** is_the_one ? " (value is fixed)" : ""); } else if(is_set_for_this_level){ @@ -224,7 +224,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c the_exc_one = (editing_normal_which_isnt_except && pvalexc && exc_sort_rev == line_sort_rev && exc_sort == line_sort); utf8_snprintf(tmp, sizeof(tmp), "(%c) %s%-*w%*s%s", ---- 4443,4451 ---- +--- 4442,4450 ---- is_the_one ? " (value is fixed)" : ""); } else if(is_set_for_this_level){ @@ -235,7 +235,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c exc_sort_rev == line_sort_rev && exc_sort == line_sort); utf8_snprintf(tmp, sizeof(tmp), "(%c) %s%-*w%*s%s", *************** -*** 4429,4435 **** +*** 4428,4434 **** } else{ if(pvalexc){ @@ -243,7 +243,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c is_the_one = (exc_sort_rev == line_sort_rev && exc_sort == line_sort); utf8_snprintf(tmp, sizeof(tmp), "( ) %s%-*w%*s%s", ---- 4463,4469 ---- +--- 4462,4468 ---- } else{ if(pvalexc){ @@ -252,7 +252,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c exc_sort == line_sort); utf8_snprintf(tmp, sizeof(tmp), "( ) %s%-*w%*s%s", *************** -*** 4440,4446 **** +*** 4439,4445 **** } else{ pval = v->current_val.p; @@ -260,7 +260,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c is_the_one = ((pval || default_ok) && var_sort_rev == line_sort_rev && var_sort == line_sort); ---- 4474,4480 ---- +--- 4473,4479 ---- } else{ pval = v->current_val.p; @@ -269,7 +269,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c var_sort_rev == line_sort_rev && var_sort == line_sort); *************** -*** 5606,5614 **** +*** 5595,5603 **** else if(revert && var == &ps->vars[V_SORT_KEY]){ int def_sort_rev; @@ -279,7 +279,7 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c else if(var == &ps->vars[V_THREAD_MORE_CHAR] || var == &ps->vars[V_THREAD_EXP_CHAR] || var == &ps->vars[V_THREAD_LASTREPLY_CHAR]){ ---- 5640,5654 ---- +--- 5629,5643 ---- else if(revert && var == &ps->vars[V_SORT_KEY]){ int def_sort_rev; @@ -295,9 +295,9 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.fancy/alpine/confscroll.c else if(var == &ps->vars[V_THREAD_MORE_CHAR] || var == &ps->vars[V_THREAD_EXP_CHAR] || var == &ps->vars[V_THREAD_LASTREPLY_CHAR]){ -diff -rc alpine-2.22/alpine/confscroll.h alpine-2.22.fancy/alpine/confscroll.h -*** alpine-2.22/alpine/confscroll.h 2020-01-19 01:32:20.190475483 -0700 ---- alpine-2.22.fancy/alpine/confscroll.h 2020-01-19 01:34:41.249565310 -0700 +diff -rc alpine-2.23/alpine/confscroll.h alpine-2.23.fancy/alpine/confscroll.h +*** alpine-2.23/alpine/confscroll.h 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fancy/alpine/confscroll.h 2020-06-18 16:08:07.149575591 -0600 *************** *** 97,103 **** int radiobutton_tool(struct pine *, int, CONF_S **, unsigned); @@ -315,11 +315,11 @@ diff -rc alpine-2.22/alpine/confscroll.h alpine-2.22.fancy/alpine/confscroll.h int exclude_config_var(struct pine *, struct variable *, int); int config_exit_cmd(unsigned); int simple_exit_cmd(unsigned); -diff -rc alpine-2.22/alpine/keymenu.c alpine-2.22.fancy/alpine/keymenu.c -*** alpine-2.22/alpine/keymenu.c 2020-01-19 01:32:20.360472098 -0700 ---- alpine-2.22.fancy/alpine/keymenu.c 2020-01-19 01:34:41.255565261 -0700 +diff -rc alpine-2.23/alpine/keymenu.c alpine-2.23.fancy/alpine/keymenu.c +*** alpine-2.23/alpine/keymenu.c 2020-06-18 15:19:23.469318992 -0600 +--- alpine-2.23.fancy/alpine/keymenu.c 2020-06-18 16:08:07.149575591 -0600 *************** -*** 665,674 **** +*** 679,688 **** RCOMPOSE_MENU, HOMEKEY_MENU, ENDKEY_MENU, @@ -330,7 +330,7 @@ diff -rc alpine-2.22/alpine/keymenu.c alpine-2.22.fancy/alpine/keymenu.c {"@", N_("Quota"), {MC_QUOTA,1,{'@'}}, KS_NONE}, NULL_MENU}; INST_KEY_MENU(index_keymenu, index_keys); ---- 665,689 ---- +--- 679,703 ---- RCOMPOSE_MENU, HOMEKEY_MENU, ENDKEY_MENU, @@ -357,7 +357,7 @@ diff -rc alpine-2.22/alpine/keymenu.c alpine-2.22.fancy/alpine/keymenu.c NULL_MENU}; INST_KEY_MENU(index_keymenu, index_keys); *************** -*** 743,751 **** +*** 757,765 **** RCOMPOSE_MENU, HOMEKEY_MENU, ENDKEY_MENU, @@ -367,7 +367,7 @@ diff -rc alpine-2.22/alpine/keymenu.c alpine-2.22.fancy/alpine/keymenu.c NULL_MENU}; INST_KEY_MENU(thread_keymenu, thread_keys); ---- 758,779 ---- +--- 772,793 ---- RCOMPOSE_MENU, HOMEKEY_MENU, ENDKEY_MENU, @@ -391,7 +391,7 @@ diff -rc alpine-2.22/alpine/keymenu.c alpine-2.22.fancy/alpine/keymenu.c INST_KEY_MENU(thread_keymenu, thread_keys); *************** -*** 913,919 **** +*** 927,933 **** NULL_MENU, NULL_MENU, NULL_MENU, @@ -399,7 +399,7 @@ diff -rc alpine-2.22/alpine/keymenu.c alpine-2.22.fancy/alpine/keymenu.c INST_KEY_MENU(view_keymenu, view_keys); ---- 941,960 ---- +--- 955,974 ---- NULL_MENU, NULL_MENU, NULL_MENU, @@ -420,41 +420,34 @@ diff -rc alpine-2.22/alpine/keymenu.c alpine-2.22.fancy/alpine/keymenu.c INST_KEY_MENU(view_keymenu, view_keys); -diff -rc alpine-2.22/alpine/keymenu.h alpine-2.22.fancy/alpine/keymenu.h -*** alpine-2.22/alpine/keymenu.h 2020-01-19 01:32:20.263474030 -0700 ---- alpine-2.22.fancy/alpine/keymenu.h 2020-01-19 01:34:41.257565244 -0700 +diff -rc alpine-2.23/alpine/keymenu.h alpine-2.23.fancy/alpine/keymenu.h +*** alpine-2.23/alpine/keymenu.h 2020-06-18 15:19:23.469318992 -0600 +--- alpine-2.23.fancy/alpine/keymenu.h 2020-06-18 16:08:07.149575591 -0600 *************** -*** 216,222 **** - #define MC_QUOTA 803 +*** 217,222 **** +--- 217,235 ---- #define MC_ADDHEADER 804 #define MC_XOAUTH2 805 -! + #define MC_EXTERNAL 806 ++ #define MC_DELTHREAD 807 ++ #define MC_UNDTHREAD 808 ++ #define MC_SELTHREAD 809 ++ #define MC_SSUTHREAD 810 ++ #define MC_DSUTHREAD 811 ++ #define MC_USUTHREAD 812 ++ #define MC_SORTHREAD 813 ++ #define MC_NEXTHREAD 814 ++ #define MC_KOLAPSE 815 ++ #define MC_EXPTHREAD 816 ++ #define MC_PRETHREAD 817 ++ #define MC_CTHREAD 818 ++ #define MC_OTHREAD 819 + /* Commands for S/MIME screens */ - #define MC_TRUST 900 ---- 216,234 ---- - #define MC_QUOTA 803 - #define MC_ADDHEADER 804 - #define MC_XOAUTH2 805 -! #define MC_DELTHREAD 806 -! #define MC_UNDTHREAD 807 -! #define MC_SELTHREAD 808 -! #define MC_SSUTHREAD 809 -! #define MC_DSUTHREAD 810 -! #define MC_USUTHREAD 811 -! #define MC_SORTHREAD 812 -! #define MC_NEXTHREAD 813 -! #define MC_KOLAPSE 814 -! #define MC_EXPTHREAD 815 -! #define MC_PRETHREAD 816 -! #define MC_CTHREAD 817 -! #define MC_OTHREAD 818 - - /* Commands for S/MIME screens */ - #define MC_TRUST 900 -diff -rc alpine-2.22/alpine/mailcmd.c alpine-2.22.fancy/alpine/mailcmd.c -*** alpine-2.22/alpine/mailcmd.c 2020-01-19 01:32:20.165475981 -0700 ---- alpine-2.22.fancy/alpine/mailcmd.c 2020-01-19 01:34:41.269565146 -0700 +diff -rc alpine-2.23/alpine/mailcmd.c alpine-2.23.fancy/alpine/mailcmd.c +*** alpine-2.23/alpine/mailcmd.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fancy/alpine/mailcmd.c 2020-06-18 16:08:07.153575601 -0600 *************** *** 114,120 **** char *choose_a_rule(int); @@ -641,7 +634,7 @@ diff -rc alpine-2.22/alpine/mailcmd.c alpine-2.22.fancy/alpine/mailcmd.c select_thread_stmp(state, stream, msgmap); break; *************** -*** 9586,9595 **** +*** 9578,9587 **** Returns 0 if it was cancelled, 1 otherwise. ----*/ int @@ -652,7 +645,7 @@ diff -rc alpine-2.22/alpine/mailcmd.c alpine-2.22.fancy/alpine/mailcmd.c int deefault = 'a', retval = 1; HelpType help; ESCKEY_S sorts[14]; ---- 9615,9624 ---- +--- 9607,9616 ---- Returns 0 if it was cancelled, 1 otherwise. ----*/ int @@ -664,7 +657,7 @@ diff -rc alpine-2.22/alpine/mailcmd.c alpine-2.22.fancy/alpine/mailcmd.c HelpType help; ESCKEY_S sorts[14]; *************** -*** 9622,9638 **** +*** 9614,9630 **** strncpy(prompt, _("Choose type of sort, or 'R' to reverse current sort : "), sizeof(prompt)); @@ -682,7 +675,7 @@ diff -rc alpine-2.22/alpine/mailcmd.c alpine-2.22.fancy/alpine/mailcmd.c } sorts[i].ch = 'r'; ---- 9651,9676 ---- +--- 9643,9668 ---- strncpy(prompt, _("Choose type of sort, or 'R' to reverse current sort : "), sizeof(prompt)); @@ -710,7 +703,7 @@ diff -rc alpine-2.22/alpine/mailcmd.c alpine-2.22.fancy/alpine/mailcmd.c sorts[i].ch = 'r'; *************** -*** 9656,9663 **** +*** 9648,9655 **** state->mangled_body = 1; /* signal screen's changed */ if(s == 'r') *rev = !mn_get_revsort(state->msgmap); @@ -719,7 +712,7 @@ diff -rc alpine-2.22/alpine/mailcmd.c alpine-2.22.fancy/alpine/mailcmd.c if(F_ON(F_SHOW_SORT, ps_global)) ps_global->mangled_header = 1; ---- 9694,9710 ---- +--- 9686,9702 ---- state->mangled_body = 1; /* signal screen's changed */ if(s == 'r') *rev = !mn_get_revsort(state->msgmap); @@ -738,8 +731,8 @@ diff -rc alpine-2.22/alpine/mailcmd.c alpine-2.22.fancy/alpine/mailcmd.c if(F_ON(F_SHOW_SORT, ps_global)) ps_global->mangled_header = 1; *************** -*** 10041,10043 **** ---- 10088,10465 ---- +*** 10033,10035 **** +--- 10080,10457 ---- } #endif /* _WINDOWS */ @@ -1118,9 +1111,9 @@ diff -rc alpine-2.22/alpine/mailcmd.c alpine-2.22.fancy/alpine/mailcmd.c + expand_thread(state, stream, msgmap, 0); + } + -diff -rc alpine-2.22/alpine/mailcmd.h alpine-2.22.fancy/alpine/mailcmd.h -*** alpine-2.22/alpine/mailcmd.h 2020-01-19 01:32:20.370471899 -0700 ---- alpine-2.22.fancy/alpine/mailcmd.h 2020-01-19 01:34:41.271565130 -0700 +diff -rc alpine-2.23/alpine/mailcmd.h alpine-2.23.fancy/alpine/mailcmd.h +*** alpine-2.23/alpine/mailcmd.h 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fancy/alpine/mailcmd.h 2020-06-18 16:08:07.153575601 -0600 *************** *** 90,96 **** int ask_mailbox_reopen(struct pine *, int *); @@ -1162,9 +1155,9 @@ diff -rc alpine-2.22/alpine/mailcmd.h alpine-2.22.fancy/alpine/mailcmd.h ! int expand_this_thread(struct pine *, MAILSTREAM *, MSGNO_S *, int, int); #endif /* PINE_MAILCMD_INCLUDED */ -diff -rc alpine-2.22/alpine/mailindx.c alpine-2.22.fancy/alpine/mailindx.c -*** alpine-2.22/alpine/mailindx.c 2020-01-19 01:32:20.584467638 -0700 ---- alpine-2.22.fancy/alpine/mailindx.c 2020-01-19 01:34:41.276565089 -0700 +diff -rc alpine-2.23/alpine/mailindx.c alpine-2.23.fancy/alpine/mailindx.c +*** alpine-2.23/alpine/mailindx.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fancy/alpine/mailindx.c 2020-06-18 16:08:07.153575601 -0600 *************** *** 564,569 **** --- 564,570 ---- @@ -1444,9 +1437,9 @@ diff -rc alpine-2.22/alpine/mailindx.c alpine-2.22.fancy/alpine/mailindx.c mswin_beginupdate(); update_titlebar_message(); update_titlebar_status(); -diff -rc alpine-2.22/alpine/mailindx.h alpine-2.22.fancy/alpine/mailindx.h -*** alpine-2.22/alpine/mailindx.h 2020-01-19 01:32:19.927480727 -0700 ---- alpine-2.22.fancy/alpine/mailindx.h 2020-01-19 01:34:41.277565080 -0700 +diff -rc alpine-2.23/alpine/mailindx.h alpine-2.23.fancy/alpine/mailindx.h +*** alpine-2.23/alpine/mailindx.h 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fancy/alpine/mailindx.h 2020-06-18 16:08:07.153575601 -0600 *************** *** 103,109 **** void paint_index_hline(MAILSTREAM *, long, ICE_S *); @@ -1464,12 +1457,12 @@ diff -rc alpine-2.22/alpine/mailindx.h alpine-2.22.fancy/alpine/mailindx.h COLOR_PAIR *apply_rev_color(COLOR_PAIR *, int); #ifdef _WINDOWS int index_sort_callback(int, long); -diff -rc alpine-2.22/alpine/mailview.c alpine-2.22.fancy/alpine/mailview.c -*** alpine-2.22/alpine/mailview.c 2020-01-19 01:32:20.102477235 -0700 ---- alpine-2.22.fancy/alpine/mailview.c 2020-01-19 01:34:41.284565023 -0700 +diff -rc alpine-2.23/alpine/mailview.c alpine-2.23.fancy/alpine/mailview.c +*** alpine-2.23/alpine/mailview.c 2020-06-18 15:19:23.469318992 -0600 +--- alpine-2.23.fancy/alpine/mailview.c 2020-06-18 16:08:07.153575601 -0600 *************** -*** 3380,3385 **** ---- 3380,3431 ---- +*** 3495,3500 **** +--- 3495,3546 ---- print_to_printer(sparms); break; @@ -1522,9 +1515,9 @@ diff -rc alpine-2.22/alpine/mailview.c alpine-2.22.fancy/alpine/mailview.c /* ------- First handle on Line ------ */ case MC_GOTOBOL : -diff -rc alpine-2.22/alpine/roleconf.c alpine-2.22.fancy/alpine/roleconf.c -*** alpine-2.22/alpine/roleconf.c 2020-01-19 01:32:20.509469132 -0700 ---- alpine-2.22.fancy/alpine/roleconf.c 2020-01-19 01:34:41.293564949 -0700 +diff -rc alpine-2.23/alpine/roleconf.c alpine-2.23.fancy/alpine/roleconf.c +*** alpine-2.23/alpine/roleconf.c 2020-06-18 15:19:23.469318992 -0600 +--- alpine-2.23.fancy/alpine/roleconf.c 2020-06-18 16:08:07.153575601 -0600 *************** *** 4478,4488 **** ctmp->tool = role_sort_tool; @@ -1601,9 +1594,9 @@ diff -rc alpine-2.22/alpine/roleconf.c alpine-2.22.fancy/alpine/roleconf.c (*result)->action->sort_is_set = 1; (*result)->action->sortorder = def_sort; (*result)->action->revsort = (def_sort_rev ? 1 : 0); -diff -rc alpine-2.22/alpine/setup.c alpine-2.22.fancy/alpine/setup.c -*** alpine-2.22/alpine/setup.c 2020-01-19 01:32:19.970479867 -0700 ---- alpine-2.22.fancy/alpine/setup.c 2020-01-19 01:34:41.295564933 -0700 +diff -rc alpine-2.23/alpine/setup.c alpine-2.23.fancy/alpine/setup.c +*** alpine-2.23/alpine/setup.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fancy/alpine/setup.c 2020-06-18 16:08:07.153575601 -0600 *************** *** 262,268 **** ctmpa->flags |= CF_NOSELECT; @@ -1680,8 +1673,8 @@ diff -rc alpine-2.22/alpine/setup.c alpine-2.22.fancy/alpine/setup.c ctmpa->keymenu = &config_yesno_keymenu; ctmpa->tool = yesno_tool; *************** -*** 470,475 **** ---- 519,533 ---- +*** 469,474 **** +--- 518,532 ---- } } @@ -1697,12 +1690,12 @@ diff -rc alpine-2.22/alpine/setup.c alpine-2.22.fancy/alpine/setup.c treat_color_vars_as_text = 0; free_saved_config(ps, &vsave, expose_hidden_config); #ifdef _WINDOWS -diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c -*** alpine-2.22/pith/conf.c 2020-01-19 01:32:18.678505766 -0700 ---- alpine-2.22.fancy/pith/conf.c 2020-01-19 01:34:41.307564835 -0700 +diff -rc alpine-2.23/pith/conf.c alpine-2.23.fancy/pith/conf.c +*** alpine-2.23/pith/conf.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/conf.c 2020-06-18 16:08:07.153575601 -0600 *************** -*** 205,210 **** ---- 205,212 ---- +*** 207,212 **** +--- 207,214 ---- CONF_TXT_T cf_text_sort_key[] = "Sets presentation order of messages in Index. Choices:\n# Subject, From, Arrival, Date, Size, To, Cc, OrderedSubj, Score, and Thread.\n# Order may be reversed by appending /Reverse. Default: \"Arrival\"."; @@ -1712,8 +1705,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c CONF_TXT_T cf_text_folder_sort_rule[] = "Sets presentation order of folder list entries. Choices: alphabetical,\n# alpha-with-dirs-last, alpha-with-dirs-first.\n# Default: \"alpha-with-directories-last\"."; *************** -*** 533,538 **** ---- 535,542 ---- +*** 539,544 **** +--- 541,548 ---- NULL, cf_text_fcc_name_rule}, {"sort-key", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_sort_key}, @@ -1723,7 +1716,7 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c "Address Book Sort Rule", cf_text_addrbook_sort_rule}, {"folder-sort-rule", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, *************** -*** 1593,1599 **** +*** 1607,1613 **** register struct variable *vars = ps->vars; int obs_header_in_reply = 0, /* the obs_ variables are to */ obs_old_style_reply = 0, /* support backwards compatibility */ @@ -1731,7 +1724,7 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c long rvl; PINERC_S *fixedprc = NULL; FeatureLevel obs_feature_level; ---- 1597,1603 ---- +--- 1611,1617 ---- register struct variable *vars = ps->vars; int obs_header_in_reply = 0, /* the obs_ variables are to */ obs_old_style_reply = 0, /* support backwards compatibility */ @@ -1740,8 +1733,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c PINERC_S *fixedprc = NULL; FeatureLevel obs_feature_level; *************** -*** 1621,1626 **** ---- 1625,1631 ---- +*** 1635,1640 **** +--- 1639,1645 ---- GLO_FEATURE_LEVEL = cpystr("sappling"); GLO_OLD_STYLE_REPLY = cpystr(DF_OLD_STYLE_REPLY); GLO_SORT_KEY = cpystr(DF_SORT_KEY); @@ -1750,7 +1743,7 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c GLO_FCC_RULE = cpystr(DF_FCC_RULE); GLO_AB_SORT_RULE = cpystr(DF_AB_SORT_RULE); *************** -*** 2564,2570 **** +*** 2586,2592 **** set_current_val(&vars[V_ARCHIVED_FOLDERS], TRUE, TRUE); set_current_val(&vars[V_INCOMING_FOLDERS], TRUE, TRUE); set_current_val(&vars[V_SORT_KEY], TRUE, TRUE); @@ -1758,7 +1751,7 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c snprintf(tmp_20k_buf, SIZEOF_20KBUF, "Sort type \"%.200s\" is invalid", VAR_SORT_KEY); init_error(ps, SM_ORDER | SM_DING, 3, 5, tmp_20k_buf); ps->def_sort = SortArrival; ---- 2569,2575 ---- +--- 2591,2597 ---- set_current_val(&vars[V_ARCHIVED_FOLDERS], TRUE, TRUE); set_current_val(&vars[V_INCOMING_FOLDERS], TRUE, TRUE); set_current_val(&vars[V_SORT_KEY], TRUE, TRUE); @@ -1767,8 +1760,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c init_error(ps, SM_ORDER | SM_DING, 3, 5, tmp_20k_buf); ps->def_sort = SortArrival; *************** -*** 2573,2578 **** ---- 2578,2594 ---- +*** 2595,2600 **** +--- 2600,2616 ---- else ps->def_sort_rev = def_sort_rev; @@ -1787,8 +1780,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c {NAMEVAL_S *v; int i; for(i = 0; (v = save_msg_rules(i)); i++) *************** -*** 2998,3003 **** ---- 3014,3021 ---- +*** 3020,3025 **** +--- 3036,3043 ---- F_COLOR_LINE_IMPORTANT, h_config_color_thrd_import, PREF_INDX, 0}, {"thread-sorts-by-arrival", "Thread Sorts by Arrival", F_THREAD_SORTS_BY_ARRIVAL, h_config_thread_sorts_by_arrival, PREF_INDX, 0}, @@ -1798,8 +1791,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c /* Viewer prefs */ {"enable-msg-view-addresses", "Enable Message View Address Links", *************** -*** 7727,7732 **** ---- 7745,7752 ---- +*** 7783,7788 **** +--- 7801,7808 ---- return(h_config_fcc_rule); case V_SORT_KEY : return(h_config_sort_key); @@ -1808,12 +1801,12 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fancy/pith/conf.c case V_AB_SORT_RULE : return(h_config_ab_sort_rule); case V_FLD_SORT_RULE : -diff -rc alpine-2.22/pith/conf.h alpine-2.22.fancy/pith/conf.h -*** alpine-2.22/pith/conf.h 2020-01-19 01:32:19.489489496 -0700 ---- alpine-2.22.fancy/pith/conf.h 2020-01-19 01:34:41.310564810 -0700 +diff -rc alpine-2.23/pith/conf.h alpine-2.23.fancy/pith/conf.h +*** alpine-2.23/pith/conf.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/conf.h 2020-06-18 16:08:07.153575601 -0600 *************** -*** 144,149 **** ---- 144,152 ---- +*** 150,155 **** +--- 150,158 ---- #define VAR_SORT_KEY vars[V_SORT_KEY].current_val.p #define GLO_SORT_KEY vars[V_SORT_KEY].global_val.p #define COM_SORT_KEY vars[V_SORT_KEY].cmdline_val.p @@ -1823,9 +1816,9 @@ diff -rc alpine-2.22/pith/conf.h alpine-2.22.fancy/pith/conf.h #define VAR_AB_SORT_RULE vars[V_AB_SORT_RULE].current_val.p #define GLO_AB_SORT_RULE vars[V_AB_SORT_RULE].global_val.p #define VAR_FLD_SORT_RULE vars[V_FLD_SORT_RULE].current_val.p -diff -rc alpine-2.22/pith/conftype.h alpine-2.22.fancy/pith/conftype.h -*** alpine-2.22/pith/conftype.h 2020-01-19 01:32:18.702505283 -0700 ---- alpine-2.22.fancy/pith/conftype.h 2020-01-19 01:34:41.314564777 -0700 +diff -rc alpine-2.23/pith/conftype.h alpine-2.23.fancy/pith/conftype.h +*** alpine-2.23/pith/conftype.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/conftype.h 2020-06-18 16:08:07.153575601 -0600 *************** *** 59,64 **** --- 59,65 ---- @@ -1837,8 +1830,8 @@ diff -rc alpine-2.22/pith/conftype.h alpine-2.22.fancy/pith/conftype.h , V_FLD_SORT_RULE , V_GOTO_DEFAULT_RULE *************** -*** 519,524 **** ---- 520,526 ---- +*** 526,531 **** +--- 527,533 ---- F_QUELL_TIMEZONE, F_QUELL_USERAGENT, F_COLOR_LINE_IMPORTANT, @@ -1847,17 +1840,17 @@ diff -rc alpine-2.22/pith/conftype.h alpine-2.22.fancy/pith/conftype.h F_ENABLE_FULL_HDR_AND_TEXT, F_QUELL_FULL_HDR_RESET, *************** -*** 784,788 **** ---- 786,791 ---- +*** 791,795 **** +--- 793,798 ---- /* exported prototypes */ + #define DF_THREAD_SORT_KEY "thread" #endif /* PITH_CONFTYPE_INCLUDED */ -diff -rc alpine-2.22/pith/flag.c alpine-2.22.fancy/pith/flag.c -*** alpine-2.22/pith/flag.c 2020-01-19 01:32:18.569507960 -0700 ---- alpine-2.22.fancy/pith/flag.c 2020-01-19 01:34:41.316564761 -0700 +diff -rc alpine-2.23/pith/flag.c alpine-2.23.fancy/pith/flag.c +*** alpine-2.23/pith/flag.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/flag.c 2020-06-18 16:08:07.153575601 -0600 *************** *** 594,607 **** @@ -1891,9 +1884,9 @@ diff -rc alpine-2.22/pith/flag.c alpine-2.22.fancy/pith/flag.c } if(topthrd){ -diff -rc alpine-2.22/pith/indxtype.h alpine-2.22.fancy/pith/indxtype.h -*** alpine-2.22/pith/indxtype.h 2020-01-19 01:32:18.655506229 -0700 ---- alpine-2.22.fancy/pith/indxtype.h 2020-01-19 01:34:41.317564753 -0700 +diff -rc alpine-2.23/pith/indxtype.h alpine-2.23.fancy/pith/indxtype.h +*** alpine-2.23/pith/indxtype.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/indxtype.h 2020-06-18 16:08:07.153575601 -0600 *************** *** 78,84 **** iKey, iKeyInit, @@ -1911,9 +1904,9 @@ diff -rc alpine-2.22/pith/indxtype.h alpine-2.22.fancy/pith/indxtype.h iNewsAndTo, iToAndNews, iNewsAndRecips, iRecipsAndNews, iFromTo, iFromToNotNews, iFrom, iTo, iSender, iCc, iNews, iRecips, iCurNews, iArrow, -diff -rc alpine-2.22/pith/mailindx.c alpine-2.22.fancy/pith/mailindx.c -*** alpine-2.22/pith/mailindx.c 2020-01-19 01:32:19.552488235 -0700 ---- alpine-2.22.fancy/pith/mailindx.c 2020-01-19 01:34:41.326564679 -0700 +diff -rc alpine-2.23/pith/mailindx.c alpine-2.23.fancy/pith/mailindx.c +*** alpine-2.23/pith/mailindx.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/mailindx.c 2020-06-18 16:08:07.153575601 -0600 *************** *** 229,234 **** --- 229,235 ---- @@ -2084,7 +2077,7 @@ diff -rc alpine-2.22/pith/mailindx.c alpine-2.22.fancy/pith/mailindx.c /* * width is < available strsize and *************** -*** 6213,6223 **** +*** 6211,6221 **** border = str + width; if(pith_opt_condense_thread_cue) width = (*pith_opt_condense_thread_cue)(thd, ice, &str, &strsize, width, @@ -2096,7 +2089,7 @@ diff -rc alpine-2.22/pith/mailindx.c alpine-2.22.fancy/pith/mailindx.c fptr = str; if(thd) ---- 6236,6243 ---- +--- 6234,6241 ---- border = str + width; if(pith_opt_condense_thread_cue) width = (*pith_opt_condense_thread_cue)(thd, ice, &str, &strsize, width, @@ -2105,9 +2098,9 @@ diff -rc alpine-2.22/pith/mailindx.c alpine-2.22.fancy/pith/mailindx.c fptr = str; if(thd) -diff -rc alpine-2.22/pith/pattern.c alpine-2.22.fancy/pith/pattern.c -*** alpine-2.22/pith/pattern.c 2020-01-19 01:32:19.260494080 -0700 ---- alpine-2.22.fancy/pith/pattern.c 2020-01-19 01:34:41.335564605 -0700 +diff -rc alpine-2.23/pith/pattern.c alpine-2.23.fancy/pith/pattern.c +*** alpine-2.23/pith/pattern.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/pattern.c 2020-06-18 16:08:07.153575601 -0600 *************** *** 1756,1762 **** SortOrder def_sort; @@ -2125,12 +2118,12 @@ diff -rc alpine-2.22/pith/pattern.c alpine-2.22.fancy/pith/pattern.c action->sort_is_set = 1; action->sortorder = def_sort; action->revsort = (def_sort_rev ? 1 : 0); -diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fancy/pith/pine.hlp -*** alpine-2.22/pith/pine.hlp 2020-01-19 01:32:19.035498584 -0700 ---- alpine-2.22.fancy/pith/pine.hlp 2020-01-19 01:34:41.394564121 -0700 +diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.fancy/pith/pine.hlp +*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/pine.hlp 2020-06-18 16:08:07.157575611 -0600 *************** -*** 4632,4637 **** ---- 4632,4638 ---- +*** 4714,4719 **** +--- 4714,4720 ----

  • OPTION:
  • OPTION:
  • OPTION: @@ -2139,8 +2132,8 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fancy/pith/pine.hlp
  • OPTION:
  • OPTION: *************** -*** 6572,6577 **** ---- 6573,6735 ---- +*** 6655,6660 **** +--- 6656,6818 ---- <End of help on this topic> @@ -2305,8 +2298,8 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fancy/pith/pine.hlp *************** -*** 20075,20080 **** ---- 20233,20246 ---- +*** 20153,20158 **** +--- 20311,20324 ----

    @@ -2322,8 +2315,8 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fancy/pith/pine.hlp

    This token represents the total size, in bytes, of the message. *************** -*** 23659,23664 **** ---- 23825,23869 ---- +*** 23776,23781 **** +--- 23942,23986 ---- <End of help on this topic> @@ -2370,8 +2363,8 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fancy/pith/pine.hlp *************** -*** 31641,31646 **** ---- 31846,31868 ---- +*** 31850,31855 **** +--- 32055,32077 ---- <End of help on this topic> @@ -2395,9 +2388,9 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fancy/pith/pine.hlp ====== h_config_news_cross_deletes ===== -diff -rc alpine-2.22/pith/sort.c alpine-2.22.fancy/pith/sort.c -*** alpine-2.22/pith/sort.c 2020-01-19 01:32:19.149496302 -0700 ---- alpine-2.22.fancy/pith/sort.c 2020-01-19 01:34:41.412563974 -0700 +diff -rc alpine-2.23/pith/sort.c alpine-2.23.fancy/pith/sort.c +*** alpine-2.23/pith/sort.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/sort.c 2020-06-18 16:08:07.157575611 -0600 *************** *** 91,97 **** ----*/ @@ -2539,9 +2532,9 @@ diff -rc alpine-2.22/pith/sort.c alpine-2.22.fancy/pith/sort.c sort_folder(ps_global->mail_stream, ps_global->msgmap, ! the_sort_order, sort_is_rev, flags, 1); } -diff -rc alpine-2.22/pith/sort.h alpine-2.22.fancy/pith/sort.h -*** alpine-2.22/pith/sort.h 2020-01-19 01:32:18.784503633 -0700 ---- alpine-2.22.fancy/pith/sort.h 2020-01-19 01:34:41.421563900 -0700 +diff -rc alpine-2.23/pith/sort.h alpine-2.23.fancy/pith/sort.h +*** alpine-2.23/pith/sort.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/sort.h 2020-06-18 16:08:07.157575611 -0600 *************** *** 23,29 **** @@ -2578,9 +2571,9 @@ diff -rc alpine-2.22/pith/sort.h alpine-2.22.fancy/pith/sort.h void reset_sort_order(unsigned); -diff -rc alpine-2.22/pith/state.c alpine-2.22.fancy/pith/state.c -*** alpine-2.22/pith/state.c 2020-01-19 01:32:18.700505323 -0700 ---- alpine-2.22.fancy/pith/state.c 2020-01-19 01:34:41.428563843 -0700 +diff -rc alpine-2.23/pith/state.c alpine-2.23.fancy/pith/state.c +*** alpine-2.23/pith/state.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/state.c 2020-06-18 16:08:07.157575611 -0600 *************** *** 75,80 **** --- 75,81 ---- @@ -2591,12 +2584,12 @@ diff -rc alpine-2.22/pith/state.c alpine-2.22.fancy/pith/state.c p->def_sort = SortArrival; p->sort_types[0] = SortSubject; p->sort_types[1] = SortArrival; -diff -rc alpine-2.22/pith/state.h alpine-2.22.fancy/pith/state.h -*** alpine-2.22/pith/state.h 2020-01-19 01:32:18.561508121 -0700 ---- alpine-2.22.fancy/pith/state.h 2020-01-19 01:34:41.487563359 -0700 +diff -rc alpine-2.23/pith/state.h alpine-2.23.fancy/pith/state.h +*** alpine-2.23/pith/state.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/state.h 2020-06-18 16:08:07.157575611 -0600 *************** -*** 139,144 **** ---- 139,146 ---- +*** 148,153 **** +--- 148,155 ---- unsigned unseen_in_view:1; unsigned start_in_context:1; /* start fldr_scrn in current cntxt */ unsigned def_sort_rev:1; /* true if reverse sort is default */ @@ -2606,8 +2599,8 @@ diff -rc alpine-2.22/pith/state.h alpine-2.22.fancy/pith/state.h unsigned tcptimeout:1; /* a tcp timeout is in progress */ *************** -*** 302,307 **** ---- 304,312 ---- +*** 311,316 **** +--- 313,321 ---- EditWhich ew_for_srch_take; SortOrder def_sort, /* Default sort type */ @@ -2617,9 +2610,9 @@ diff -rc alpine-2.22/pith/state.h alpine-2.22.fancy/pith/state.h sort_types[22]; int last_expire_year, last_expire_month; -diff -rc alpine-2.22/pith/thread.c alpine-2.22.fancy/pith/thread.c -*** alpine-2.22/pith/thread.c 2020-01-19 01:32:18.556508222 -0700 ---- alpine-2.22.fancy/pith/thread.c 2020-01-19 01:34:41.503563228 -0700 +diff -rc alpine-2.23/pith/thread.c alpine-2.23.fancy/pith/thread.c +*** alpine-2.23/pith/thread.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/thread.c 2020-06-18 16:08:07.157575611 -0600 *************** *** 30,41 **** #include "../pith/mailcmd.h" @@ -3955,9 +3948,9 @@ diff -rc alpine-2.22/pith/thread.c alpine-2.22.fancy/pith/thread.c + || sort == SortSize; + } + -diff -rc alpine-2.22/pith/thread.h alpine-2.22.fancy/pith/thread.h -*** alpine-2.22/pith/thread.h 2020-01-19 01:32:19.516488955 -0700 ---- alpine-2.22.fancy/pith/thread.h 2020-01-19 01:34:41.504563220 -0700 +diff -rc alpine-2.23/pith/thread.h alpine-2.23.fancy/pith/thread.h +*** alpine-2.23/pith/thread.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fancy/pith/thread.h 2020-06-18 16:08:07.157575611 -0600 *************** *** 38,43 **** --- 38,44 ---- @@ -4018,39 +4011,39 @@ diff -rc alpine-2.22/pith/thread.h alpine-2.22.fancy/pith/thread.h ! int allowed_thread_key(SortOrder sort); #endif /* PITH_THREAD_INCLUDED */ -diff -rc alpine-2.22/web/src/alpined.d/alpined.c alpine-2.22.fancy/web/src/alpined.d/alpined.c -*** alpine-2.22/web/src/alpined.d/alpined.c 2020-01-19 01:32:21.762444266 -0700 ---- alpine-2.22.fancy/web/src/alpined.d/alpined.c 2020-01-19 01:34:41.530563007 -0700 +diff -rc alpine-2.23/web/src/alpined.d/alpined.c alpine-2.23.fancy/web/src/alpined.d/alpined.c +*** alpine-2.23/web/src/alpined.d/alpined.c 2020-06-18 15:19:23.477318978 -0600 +--- alpine-2.23.fancy/web/src/alpined.d/alpined.c 2020-06-18 16:08:07.161575622 -0600 *************** *** 2755,2761 **** init_save_defaults(); break; case V_SORT_KEY: -! decode_sort(ps_global->VAR_SORT_KEY, &ps_global->def_sort, &def_sort_rev); +! decode_sort(wps_global->VAR_SORT_KEY, &wps_global->def_sort, &def_sort_rev); break; case V_VIEW_HDR_COLORS : - set_custom_spec_colors(ps_global); + set_custom_spec_colors(wps_global); --- 2755,2761 ---- init_save_defaults(); break; case V_SORT_KEY: -! decode_sort(ps_global->VAR_SORT_KEY, &ps_global->def_sort, &def_sort_rev, 0); +! decode_sort(wps_global->VAR_SORT_KEY, &wps_global->def_sort, &def_sort_rev, 0); break; case V_VIEW_HDR_COLORS : - set_custom_spec_colors(ps_global); + set_custom_spec_colors(wps_global); *************** *** 6331,6337 **** - && mn_get_revsort(sp_msgmap(ps_global->mail_stream)) == reversed)) - sort_folder(ps_global->mail_stream, sp_msgmap(ps_global->mail_stream), - ps_global->sort_types[i], + && mn_get_revsort(sp_msgmap(wps_global->mail_stream)) == reversed)) + sort_folder(wps_global->mail_stream, sp_msgmap(wps_global->mail_stream), + wps_global->sort_types[i], ! reversed, 0); break; } --- 6331,6337 ---- - && mn_get_revsort(sp_msgmap(ps_global->mail_stream)) == reversed)) - sort_folder(ps_global->mail_stream, sp_msgmap(ps_global->mail_stream), - ps_global->sort_types[i], + && mn_get_revsort(sp_msgmap(wps_global->mail_stream)) == reversed)) + sort_folder(wps_global->mail_stream, sp_msgmap(wps_global->mail_stream), + wps_global->sort_types[i], ! reversed, 0, 1); break; diff --git a/chappa-fillpara.patch b/chappa-fillpara.patch index 5f49676..be54ea0 100644 --- a/chappa-fillpara.patch +++ b/chappa-fillpara.patch @@ -1,9 +1,9 @@ -diff -rc alpine-2.22/alpine/mailview.c alpine-2.22.fillpara/alpine/mailview.c -*** alpine-2.22/alpine/mailview.c 2020-01-19 01:32:20.102477235 -0700 ---- alpine-2.22.fillpara/alpine/mailview.c 2020-05-07 16:46:16.683304031 -0600 +diff -rc alpine-2.23/alpine/mailview.c alpine-2.23.fillpara/alpine/mailview.c +*** alpine-2.23/alpine/mailview.c 2020-06-18 15:19:23.469318992 -0600 +--- alpine-2.23.fillpara/alpine/mailview.c 2020-06-18 16:08:12.153588516 -0600 *************** -*** 204,210 **** ---- 204,218 ---- +*** 205,211 **** +--- 205,219 ---- int pcpine_view_cursor(int, long); #endif @@ -20,8 +20,8 @@ diff -rc alpine-2.22/alpine/mailview.c alpine-2.22.fillpara/alpine/mailview.c /*---------------------------------------------------------------------- Format a buffer with the text of the current message for browser *************** -*** 295,300 **** ---- 303,319 ---- +*** 296,301 **** +--- 304,320 ---- else ps->unseen_in_view = !mc->seen; @@ -40,8 +40,8 @@ diff -rc alpine-2.22/alpine/mailview.c alpine-2.22.fillpara/alpine/mailview.c store = so_get(src, NULL, EDIT_ACCESS); *************** -*** 479,484 **** ---- 498,505 ---- +*** 480,485 **** +--- 499,506 ---- } while(ps->next_screen == SCREEN_FUN_NULL); @@ -50,9 +50,9 @@ diff -rc alpine-2.22/alpine/mailview.c alpine-2.22.fillpara/alpine/mailview.c if(we_cancel) cancel_busy_cue(-1); -diff -rc alpine-2.22/pico/basic.c alpine-2.22.fillpara/pico/basic.c -*** alpine-2.22/pico/basic.c 2020-01-19 01:32:18.272513938 -0700 ---- alpine-2.22.fillpara/pico/basic.c 2020-05-07 16:46:16.691304036 -0600 +diff -rc alpine-2.23/pico/basic.c alpine-2.23.fillpara/pico/basic.c +*** alpine-2.23/pico/basic.c 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.fillpara/pico/basic.c 2020-06-18 16:08:12.153588516 -0600 *************** *** 26,34 **** * framing, are hard. @@ -323,9 +323,9 @@ diff -rc alpine-2.22/pico/basic.c alpine-2.22.fillpara/pico/basic.c curwp->w_dotp = lforw(curwp->w_dotp); curwp->w_doto = llength(curwp->w_dotp); -diff -rc alpine-2.22/pico/efunc.h alpine-2.22.fillpara/pico/efunc.h -*** alpine-2.22/pico/efunc.h 2020-01-19 01:32:18.308513213 -0700 ---- alpine-2.22.fillpara/pico/efunc.h 2020-05-07 16:46:16.691304036 -0600 +diff -rc alpine-2.23/pico/efunc.h alpine-2.23.fillpara/pico/efunc.h +*** alpine-2.23/pico/efunc.h 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.fillpara/pico/efunc.h 2020-06-18 16:08:12.153588516 -0600 *************** *** 253,262 **** extern int fillpara(int, int); @@ -355,9 +355,9 @@ diff -rc alpine-2.22/pico/efunc.h alpine-2.22.fillpara/pico/efunc.h #endif /* EFUNC_H */ + -diff -rc alpine-2.22/pico/line.c alpine-2.22.fillpara/pico/line.c -*** alpine-2.22/pico/line.c 2020-01-19 01:32:18.308513213 -0700 ---- alpine-2.22.fillpara/pico/line.c 2020-05-07 16:46:16.691304036 -0600 +diff -rc alpine-2.23/pico/line.c alpine-2.23.fillpara/pico/line.c +*** alpine-2.23/pico/line.c 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.fillpara/pico/line.c 2020-06-18 16:08:12.153588516 -0600 *************** *** 612,627 **** lisblank(LINE *line) @@ -372,7 +372,7 @@ diff -rc alpine-2.22/pico/line.c alpine-2.22.fillpara/pico/line.c for(; n < llength(line); n++) ! if(!ucs4_isspace(lgetc(line, n).c) ! || lgetc(line, n).c >= 0xff -! || (unsigned char) lgetc(line,n).c != NBSPC) +! || (unsigned char) lgetc(line,n).c != (unsigned char) NBSPC) return(FALSE); return(TRUE); @@ -389,9 +389,9 @@ diff -rc alpine-2.22/pico/line.c alpine-2.22.fillpara/pico/line.c return(FALSE); return(TRUE); -diff -rc alpine-2.22/pico/osdep/color.h alpine-2.22.fillpara/pico/osdep/color.h -*** alpine-2.22/pico/osdep/color.h 2020-01-19 01:32:18.174515911 -0700 ---- alpine-2.22.fillpara/pico/osdep/color.h 2020-05-07 16:46:16.695304038 -0600 +diff -rc alpine-2.23/pico/osdep/color.h alpine-2.23.fillpara/pico/osdep/color.h +*** alpine-2.23/pico/osdep/color.h 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.fillpara/pico/osdep/color.h 2020-06-18 16:08:12.153588516 -0600 *************** *** 33,38 **** --- 33,39 ---- @@ -402,9 +402,9 @@ diff -rc alpine-2.22/pico/osdep/color.h alpine-2.22.fillpara/pico/osdep/color.h #endif /* PICO_OSDEP_COLOR_INCLUDED */ -diff -rc alpine-2.22/pico/search.c alpine-2.22.fillpara/pico/search.c -*** alpine-2.22/pico/search.c 2020-01-19 01:32:18.347512428 -0700 ---- alpine-2.22.fillpara/pico/search.c 2020-05-07 16:46:16.695304038 -0600 +diff -rc alpine-2.23/pico/search.c alpine-2.23.fillpara/pico/search.c +*** alpine-2.23/pico/search.c 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.fillpara/pico/search.c 2020-06-18 16:08:12.153588516 -0600 *************** *** 36,41 **** --- 36,42 ---- @@ -483,9 +483,9 @@ diff -rc alpine-2.22/pico/search.c alpine-2.22.fillpara/pico/search.c + return(TRUE); + } + -diff -rc alpine-2.22/pico/word.c alpine-2.22.fillpara/pico/word.c -*** alpine-2.22/pico/word.c 2020-01-19 01:32:18.244514502 -0700 ---- alpine-2.22.fillpara/pico/word.c 2020-05-07 16:46:16.695304038 -0600 +diff -rc alpine-2.23/pico/word.c alpine-2.23.fillpara/pico/word.c +*** alpine-2.23/pico/word.c 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.fillpara/pico/word.c 2020-06-18 16:08:12.153588516 -0600 *************** *** 25,34 **** */ @@ -1229,9 +1229,9 @@ diff -rc alpine-2.22/pico/word.c alpine-2.22.fillpara/pico/word.c + return get_indent_raw_line(q, GLine, buf, buflen, k, plb); + } + -diff -rc alpine-2.22/pith/charconv/utf8.c alpine-2.22.fillpara/pith/charconv/utf8.c -*** alpine-2.22/pith/charconv/utf8.c 2020-01-19 01:32:19.323492819 -0700 ---- alpine-2.22.fillpara/pith/charconv/utf8.c 2020-05-07 16:46:16.699304041 -0600 +diff -rc alpine-2.23/pith/charconv/utf8.c alpine-2.23.fillpara/pith/charconv/utf8.c +*** alpine-2.23/pith/charconv/utf8.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fillpara/pith/charconv/utf8.c 2020-06-18 16:08:12.153588516 -0600 *************** *** 1066,1071 **** --- 1066,1121 ---- @@ -1291,9 +1291,9 @@ diff -rc alpine-2.22/pith/charconv/utf8.c alpine-2.22.fillpara/pith/charconv/utf * Copy UTF-8 characters from src into dst. * This is intended to be used if you want to truncate a string at * the start instead of the end. For example, you have a long string -diff -rc alpine-2.22/pith/charconv/utf8.h alpine-2.22.fillpara/pith/charconv/utf8.h -*** alpine-2.22/pith/charconv/utf8.h 2020-01-19 01:32:19.323492819 -0700 ---- alpine-2.22.fillpara/pith/charconv/utf8.h 2020-05-07 16:46:16.703304044 -0600 +diff -rc alpine-2.23/pith/charconv/utf8.h alpine-2.23.fillpara/pith/charconv/utf8.h +*** alpine-2.23/pith/charconv/utf8.h 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fillpara/pith/charconv/utf8.h 2020-06-18 16:08:12.153588516 -0600 *************** *** 81,86 **** --- 81,87 ---- @@ -1304,9 +1304,9 @@ diff -rc alpine-2.22/pith/charconv/utf8.h alpine-2.22.fillpara/pith/charconv/utf size_t utf8_to_width_rhs(char *, char *, size_t, unsigned); int utf8_snprintf(char *, size_t, char *, ...); size_t utf8_to_width(char *, char *, size_t, unsigned, unsigned *); -diff -rc alpine-2.22/pith/color.c alpine-2.22.fillpara/pith/color.c -*** alpine-2.22/pith/color.c 2020-01-19 01:32:19.372491838 -0700 ---- alpine-2.22.fillpara/pith/color.c 2020-05-07 16:46:16.707304046 -0600 +diff -rc alpine-2.23/pith/color.c alpine-2.23.fillpara/pith/color.c +*** alpine-2.23/pith/color.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/color.c 2020-06-18 16:08:12.153588516 -0600 *************** *** 21,27 **** #include "../pith/state.h" @@ -1517,9 +1517,9 @@ diff -rc alpine-2.22/pith/color.c alpine-2.22.fillpara/pith/color.c } -diff -rc alpine-2.22/pith/color.h alpine-2.22.fillpara/pith/color.h -*** alpine-2.22/pith/color.h 2020-01-19 01:32:19.396491358 -0700 ---- alpine-2.22.fillpara/pith/color.h 2020-05-07 16:46:16.707304046 -0600 +diff -rc alpine-2.23/pith/color.h alpine-2.23.fillpara/pith/color.h +*** alpine-2.23/pith/color.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/color.h 2020-06-18 16:08:12.153588516 -0600 *************** *** 22,27 **** --- 22,45 ---- @@ -1557,9 +1557,9 @@ diff -rc alpine-2.22/pith/color.h alpine-2.22.fillpara/pith/color.h int color_a_quote(long, char *, LT_INS_S **, void *); void free_spec_colors(SPEC_COLOR_S **); -diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c -*** alpine-2.22/pith/filter.c 2020-01-19 01:32:19.192495441 -0700 ---- alpine-2.22.fillpara/pith/filter.c 2020-05-07 16:46:16.711304048 -0600 +diff -rc alpine-2.23/pith/filter.c alpine-2.23.fillpara/pith/filter.c +*** alpine-2.23/pith/filter.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fillpara/pith/filter.c 2020-06-18 16:08:12.157588526 -0600 *************** *** 46,51 **** --- 46,52 ---- @@ -1571,8 +1571,8 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c #include "../pith/pipe.h" #include "../pith/status.h" *************** -*** 9270,9275 **** ---- 9271,9281 ---- +*** 9453,9458 **** +--- 9454,9464 ---- margin_r, indent; char special[256]; @@ -1585,8 +1585,8 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c #define WRAP_MARG_L(F) (((WRAP_S *)(F)->opt)->margin_l) *************** -*** 9311,9316 **** ---- 9317,9328 ---- +*** 9494,9499 **** +--- 9500,9511 ---- #define WRAP_COLOR(F) (((WRAP_S *)(F)->opt)->color) #define WRAP_COLOR_SET(F) ((WRAP_COLOR(F)) && (WRAP_COLOR(F)->fg[0])) #define WRAP_SPACES(F) (((WRAP_S *)(F)->opt)->spaces) @@ -1600,8 +1600,8 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c if((F)->linep == WRAP_LASTC(F)){ \ size_t offset = (F)->linep - (F)->line; \ *************** -*** 9388,9393 **** ---- 9400,9407 ---- +*** 9571,9576 **** +--- 9583,9590 ---- case CCR : /* CRLF or CR in text ? */ state = BOL; /* either way, handle start */ @@ -1611,7 +1611,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c /* wrapped line? */ if(f->f2 == 0 && WRAP_SPC_LEN(f) && WRAP_TRL_SPC(f)){ *************** -*** 9481,9487 **** +*** 9664,9670 **** case BOL : if(WRAP_FLOW(f)){ @@ -1619,7 +1619,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c WRAP_FL_QC(f) = 1; /* init it */ state = FL_QLEV; /* go collect it */ } ---- 9495,9505 ---- +--- 9678,9688 ---- case BOL : if(WRAP_FLOW(f)){ @@ -1632,7 +1632,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c state = FL_QLEV; /* go collect it */ } *************** -*** 9495,9501 **** +*** 9678,9684 **** } /* quote level change implies new paragraph */ @@ -1640,7 +1640,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c WRAP_FL_QD(f) = 0; if(WRAP_HARD(f) == 0){ WRAP_HARD(f) = 1; ---- 9513,9528 ---- +--- 9696,9711 ---- } /* quote level change implies new paragraph */ @@ -1658,7 +1658,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c if(WRAP_HARD(f) == 0){ WRAP_HARD(f) = 1; *************** -*** 9547,9554 **** +*** 9730,9737 **** break; case FL_QLEV : @@ -1667,7 +1667,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c } else { /* if EMBEDed, process it and return here */ ---- 9574,9585 ---- +--- 9757,9768 ---- break; case FL_QLEV : @@ -1681,7 +1681,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c else { /* if EMBEDed, process it and return here */ *************** -*** 9560,9566 **** +*** 9743,9749 **** } /* quote level change signals new paragraph */ @@ -1689,7 +1689,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c WRAP_FL_QD(f) = WRAP_FL_QC(f); if(WRAP_HARD(f) == 0){ /* add hard newline */ WRAP_HARD(f) = 1; /* hard newline */ ---- 9591,9606 ---- +--- 9774,9789 ---- } /* quote level change signals new paragraph */ @@ -1707,8 +1707,8 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c if(WRAP_HARD(f) == 0){ /* add hard newline */ WRAP_HARD(f) = 1; /* hard newline */ *************** -*** 9617,9622 **** ---- 9657,9669 ---- +*** 9800,9805 **** +--- 9840,9852 ---- state = FL_SIG; break; @@ -1723,7 +1723,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c state = DFL; goto case_dfl; /* handle c like DFL */ *************** -*** 9633,9639 **** +*** 9816,9822 **** &eob); /* note any embedded*/ wrap_eol(f, 1, &ip, &eib, &op, &eob); /* plunk down newline */ @@ -1731,7 +1731,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c &op, &eob); /* write any prefix */ } ---- 9680,9686 ---- +--- 9863,9869 ---- &eob); /* note any embedded*/ wrap_eol(f, 1, &ip, &eib, &op, &eob); /* plunk down newline */ @@ -1740,7 +1740,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c } *************** -*** 10130,10136 **** +*** 10313,10319 **** wrap_flush_embed(f, &ip, &eib, &op, &eob); wrap_eol(f, 1, &ip, &eib, &op, &eob); /* plunk down newline */ @@ -1748,7 +1748,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c &eob); /* write any prefix */ } ---- 10177,10183 ---- +--- 10360,10366 ---- wrap_flush_embed(f, &ip, &eib, &op, &eob); wrap_eol(f, 1, &ip, &eib, &op, &eob); /* plunk down newline */ @@ -1757,8 +1757,8 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c } *************** -*** 10203,10208 **** ---- 10250,10262 ---- +*** 10386,10391 **** +--- 10433,10445 ---- if(WRAP_COLOR(f)) free_color_pair(&WRAP_COLOR(f)); @@ -1773,7 +1773,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c so_give(&WRAP_SPACES(f)); fs_give((void **) &f->opt); /* free wrap widths struct */ *************** -*** 10553,10559 **** +*** 10736,10742 **** { int j, i; COLOR_PAIR *col = NULL; @@ -1781,7 +1781,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c if(ps_global->VAR_QUOTE_REPLACE_STRING){ get_pair(ps_global->VAR_QUOTE_REPLACE_STRING, &prefix, &last_prefix, 0, 0); ---- 10607,10614 ---- +--- 10790,10797 ---- { int j, i; COLOR_PAIR *col = NULL; @@ -1791,7 +1791,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c if(ps_global->VAR_QUOTE_REPLACE_STRING){ get_pair(ps_global->VAR_QUOTE_REPLACE_STRING, &prefix, &last_prefix, 0, 0); *************** -*** 10562,10571 **** +*** 10745,10754 **** last_prefix = NULL; } } @@ -1802,7 +1802,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c && ps_global->VAR_QUOTE1_FORE_COLOR && ps_global->VAR_QUOTE1_BACK_COLOR && (col = new_color_pair(ps_global->VAR_QUOTE1_FORE_COLOR, ---- 10617,10638 ---- +--- 10800,10821 ---- last_prefix = NULL; } } @@ -1826,7 +1826,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c && ps_global->VAR_QUOTE1_BACK_COLOR && (col = new_color_pair(ps_global->VAR_QUOTE1_FORE_COLOR, *************** -*** 10573,10579 **** +*** 10756,10762 **** && pico_is_good_colorpair(col)){ GF_COLOR_PUTC(f, col); } @@ -1834,7 +1834,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c && ps_global->VAR_QUOTE2_FORE_COLOR && ps_global->VAR_QUOTE2_BACK_COLOR && (col = new_color_pair(ps_global->VAR_QUOTE2_FORE_COLOR, ---- 10640,10646 ---- +--- 10823,10829 ---- && pico_is_good_colorpair(col)){ GF_COLOR_PUTC(f, col); } @@ -1843,7 +1843,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c && ps_global->VAR_QUOTE2_BACK_COLOR && (col = new_color_pair(ps_global->VAR_QUOTE2_FORE_COLOR, *************** -*** 10581,10587 **** +*** 10764,10770 **** && pico_is_good_colorpair(col)){ GF_COLOR_PUTC(f, col); } @@ -1851,7 +1851,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c && ps_global->VAR_QUOTE3_FORE_COLOR && ps_global->VAR_QUOTE3_BACK_COLOR && (col = new_color_pair(ps_global->VAR_QUOTE3_FORE_COLOR, ---- 10648,10654 ---- +--- 10831,10837 ---- && pico_is_good_colorpair(col)){ GF_COLOR_PUTC(f, col); } @@ -1860,7 +1860,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c && ps_global->VAR_QUOTE3_BACK_COLOR && (col = new_color_pair(ps_global->VAR_QUOTE3_FORE_COLOR, *************** -*** 10595,10637 **** +*** 10778,10820 **** } } @@ -1904,7 +1904,7 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c return 0; } ---- 10662,10708 ---- +--- 10845,10891 ---- } } @@ -1953,8 +1953,8 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c return 0; } *************** -*** 10663,10668 **** ---- 10734,10745 ---- +*** 10846,10851 **** +--- 10917,10928 ---- wrap->hdr_color = (GFW_HDRCOLOR & flags) == GFW_HDRCOLOR; wrap->for_compose = (GFW_FORCOMPOSE & flags) == GFW_FORCOMPOSE; wrap->handle_soft_hyphen = (GFW_SOFTHYPHEN & flags) == GFW_SOFTHYPHEN; @@ -1968,8 +1968,8 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c return((void *) wrap); } *************** -*** 11106,11112 **** ---- 11183,11397 ---- +*** 11289,11295 **** +--- 11366,11580 ---- } \ } @@ -2185,12 +2185,12 @@ diff -rc alpine-2.22/pith/filter.c alpine-2.22.fillpara/pith/filter.c /* * this simple filter accumulates characters until a newline, offers it -diff -rc alpine-2.22/pith/filter.h alpine-2.22.fillpara/pith/filter.h -*** alpine-2.22/pith/filter.h 2020-01-19 01:32:19.683485612 -0700 ---- alpine-2.22.fillpara/pith/filter.h 2020-05-07 16:46:16.715304052 -0600 +diff -rc alpine-2.23/pith/filter.h alpine-2.23.fillpara/pith/filter.h +*** alpine-2.23/pith/filter.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/filter.h 2020-06-18 16:08:12.157588526 -0600 *************** -*** 216,221 **** ---- 216,222 ---- +*** 217,222 **** +--- 217,223 ---- void *gf_prepend_editorial_opt(prepedtest_t, char *); void gf_nvtnl_local(FILTER_S *, int); void gf_local_nvtnl(FILTER_S *, int); @@ -2198,9 +2198,9 @@ diff -rc alpine-2.22/pith/filter.h alpine-2.22.fillpara/pith/filter.h void *gf_url_hilite_opt(URL_HILITE_S *, HANDLE_S **, int); void free_filter_module_globals(void); -diff -rc alpine-2.22/pith/filttype.h alpine-2.22.fillpara/pith/filttype.h -*** alpine-2.22/pith/filttype.h 2020-01-19 01:32:19.531488655 -0700 ---- alpine-2.22.fillpara/pith/filttype.h 2020-05-07 16:46:16.715304052 -0600 +diff -rc alpine-2.23/pith/filttype.h alpine-2.23.fillpara/pith/filttype.h +*** alpine-2.23/pith/filttype.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/filttype.h 2020-06-18 16:08:12.157588526 -0600 *************** *** 36,41 **** --- 36,43 ---- @@ -2212,9 +2212,9 @@ diff -rc alpine-2.22/pith/filttype.h alpine-2.22.fillpara/pith/filttype.h void *opt; /* optional per instance data */ void *data; /* misc internal data pointer */ unsigned char queue[1 + GF_MAXBUF]; -diff -rc alpine-2.22/pith/mailview.c alpine-2.22.fillpara/pith/mailview.c -*** alpine-2.22/pith/mailview.c 2020-01-19 01:32:18.803503250 -0700 ---- alpine-2.22.fillpara/pith/mailview.c 2020-05-07 16:46:16.715304052 -0600 +diff -rc alpine-2.23/pith/mailview.c alpine-2.23.fillpara/pith/mailview.c +*** alpine-2.23/pith/mailview.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/mailview.c 2020-06-18 16:08:12.157588526 -0600 *************** *** 55,61 **** #include "../pith/escapes.h" @@ -2472,9 +2472,9 @@ diff -rc alpine-2.22/pith/mailview.c alpine-2.22.fillpara/pith/mailview.c #define UES_LEN 12 #define UES_MAX 32 -diff -rc alpine-2.22/pith/mailview.h alpine-2.22.fillpara/pith/mailview.h -*** alpine-2.22/pith/mailview.h 2020-01-19 01:32:19.614486993 -0700 ---- alpine-2.22.fillpara/pith/mailview.h 2020-05-07 16:46:16.719304053 -0600 +diff -rc alpine-2.23/pith/mailview.h alpine-2.23.fillpara/pith/mailview.h +*** alpine-2.23/pith/mailview.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/mailview.h 2020-06-18 16:08:12.157588526 -0600 *************** *** 146,151 **** --- 146,152 ---- @@ -2485,9 +2485,9 @@ diff -rc alpine-2.22/pith/mailview.h alpine-2.22.fillpara/pith/mailview.h int scroll_handle_start_color(char *, size_t, int *); int scroll_handle_end_color(char *, size_t, int *, int); int width_at_this_position(unsigned char *, unsigned long); -diff -rc alpine-2.22/pith/osdep/color.c alpine-2.22.fillpara/pith/osdep/color.c -*** alpine-2.22/pith/osdep/color.c 2020-01-19 01:32:18.620506934 -0700 ---- alpine-2.22.fillpara/pith/osdep/color.c 2020-05-07 23:52:12.301348731 -0600 +diff -rc alpine-2.23/pith/osdep/color.c alpine-2.23.fillpara/pith/osdep/color.c +*** alpine-2.23/pith/osdep/color.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fillpara/pith/osdep/color.c 2020-06-18 16:08:12.157588526 -0600 *************** *** 32,38 **** @@ -3792,9 +3792,9 @@ diff -rc alpine-2.22/pith/osdep/color.c alpine-2.22.fillpara/pith/osdep/color.c + return allowed_qstr; + } + -diff -rc alpine-2.22/pith/osdep/color.h alpine-2.22.fillpara/pith/osdep/color.h -*** alpine-2.22/pith/osdep/color.h 2020-01-19 01:32:18.622506893 -0700 ---- alpine-2.22.fillpara/pith/osdep/color.h 2020-05-07 16:46:16.723304056 -0600 +diff -rc alpine-2.23/pith/osdep/color.h alpine-2.23.fillpara/pith/osdep/color.h +*** alpine-2.23/pith/osdep/color.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/osdep/color.h 2020-06-18 16:08:12.157588526 -0600 *************** *** 17,22 **** --- 17,40 ---- @@ -3845,12 +3845,12 @@ diff -rc alpine-2.22/pith/osdep/color.h alpine-2.22.fillpara/pith/osdep/color.h ! void record_quote_string (QSTRING_S *); #endif /* PITH_OSDEP_COLOR_INCLUDED */ -diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fillpara/pith/pine.hlp -*** alpine-2.22/pith/pine.hlp 2020-01-19 01:32:19.035498584 -0700 ---- alpine-2.22.fillpara/pith/pine.hlp 2020-05-07 16:46:16.739304066 -0600 +diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.fillpara/pith/pine.hlp +*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/pine.hlp 2020-06-18 16:08:12.161588536 -0600 *************** -*** 7820,7825 **** ---- 7820,7865 ---- +*** 7903,7908 **** +--- 7903,7948 ---- "type the character ^".

    @@ -3897,12 +3897,12 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fillpara/pith/pine.hlp <End of help on this topic> -diff -rc alpine-2.22/pith/reply.c alpine-2.22.fillpara/pith/reply.c -*** alpine-2.22/pith/reply.c 2020-01-19 01:32:19.475489776 -0700 ---- alpine-2.22.fillpara/pith/reply.c 2020-05-07 16:46:16.763304080 -0600 +diff -rc alpine-2.23/pith/reply.c alpine-2.23.fillpara/pith/reply.c +*** alpine-2.23/pith/reply.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/reply.c 2020-06-18 16:08:12.161588536 -0600 *************** -*** 2838,2843 **** ---- 2838,2846 ---- +*** 2839,2844 **** +--- 2839,2847 ---- if(flow_res && ps_global->reply.use_flowed) wrapflags |= GFW_FLOW_RESULT; @@ -3913,7 +3913,7 @@ diff -rc alpine-2.22/pith/reply.c alpine-2.22.fillpara/pith/reply.c /* * The 80 will cause longer lines than what is likely *************** -*** 2931,2937 **** +*** 2932,2938 **** dq.do_color = 0; dq.delete_all = 1; @@ -3921,7 +3921,7 @@ diff -rc alpine-2.22/pith/reply.c alpine-2.22.fillpara/pith/reply.c filters[filtcnt++].data = gf_line_test_opt(delete_quotes, &dq); } ---- 2934,2940 ---- +--- 2935,2941 ---- dq.do_color = 0; dq.delete_all = 1; @@ -3929,12 +3929,12 @@ diff -rc alpine-2.22/pith/reply.c alpine-2.22.fillpara/pith/reply.c filters[filtcnt++].data = gf_line_test_opt(delete_quotes, &dq); } -diff -rc alpine-2.22/pith/state.c alpine-2.22.fillpara/pith/state.c -*** alpine-2.22/pith/state.c 2020-01-19 01:32:18.700505323 -0700 ---- alpine-2.22.fillpara/pith/state.c 2020-05-07 16:46:16.767304083 -0600 +diff -rc alpine-2.23/pith/state.c alpine-2.23.fillpara/pith/state.c +*** alpine-2.23/pith/state.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/state.c 2020-06-18 16:08:12.161588536 -0600 *************** -*** 229,234 **** ---- 229,236 ---- +*** 235,240 **** +--- 235,242 ---- if((*pps)->kw_colors) free_spec_colors(&(*pps)->kw_colors); @@ -3943,12 +3943,12 @@ diff -rc alpine-2.22/pith/state.c alpine-2.22.fillpara/pith/state.c if((*pps)->atmts){ int i; -diff -rc alpine-2.22/pith/state.h alpine-2.22.fillpara/pith/state.h -*** alpine-2.22/pith/state.h 2020-01-19 01:32:18.561508121 -0700 ---- alpine-2.22.fillpara/pith/state.h 2020-05-07 16:46:16.767304083 -0600 +diff -rc alpine-2.23/pith/state.h alpine-2.23.fillpara/pith/state.h +*** alpine-2.23/pith/state.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/state.h 2020-06-18 16:08:12.161588536 -0600 *************** -*** 251,256 **** ---- 251,258 ---- +*** 260,265 **** +--- 260,267 ---- SPEC_COLOR_S *hdr_colors; /* list of configured colors for view */ SPEC_COLOR_S *index_token_colors; /* list of configured colors for index */ @@ -3957,9 +3957,9 @@ diff -rc alpine-2.22/pith/state.h alpine-2.22.fillpara/pith/state.h short init_context; struct { -diff -rc alpine-2.22/pith/text.c alpine-2.22.fillpara/pith/text.c -*** alpine-2.22/pith/text.c 2020-01-19 01:32:19.317492939 -0700 ---- alpine-2.22.fillpara/pith/text.c 2020-05-07 16:46:16.767304083 -0600 +diff -rc alpine-2.23/pith/text.c alpine-2.23.fillpara/pith/text.c +*** alpine-2.23/pith/text.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fillpara/pith/text.c 2020-06-18 16:08:12.161588536 -0600 *************** *** 92,98 **** char *err, *charset; diff --git a/chappa-fromheader.patch b/chappa-fromheader.patch index bb0f321..d3bff19 100644 --- a/chappa-fromheader.patch +++ b/chappa-fromheader.patch @@ -1,6 +1,6 @@ -diff -rc alpine-2.22/alpine/send.c alpine-2.22.fromheader/alpine/send.c -*** alpine-2.22/alpine/send.c 2020-01-19 01:32:20.126476758 -0700 ---- alpine-2.22.fromheader/alpine/send.c 2020-01-19 01:34:53.915466200 -0700 +diff -rc alpine-2.23/alpine/send.c alpine-2.23.fromheader/alpine/send.c +*** alpine-2.23/alpine/send.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.fromheader/alpine/send.c 2020-06-18 16:08:13.005590716 -0600 *************** *** 909,915 **** 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}, @@ -19,8 +19,8 @@ diff -rc alpine-2.22/alpine/send.c alpine-2.22.fromheader/alpine/send.c build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, *************** -*** 2364,2369 **** ---- 2364,2374 ---- +*** 2368,2373 **** +--- 2368,2378 ---- he->rich_header = 0; } } @@ -33,7 +33,7 @@ diff -rc alpine-2.22/alpine/send.c alpine-2.22.fromheader/alpine/send.c he_from = he; break; *************** -*** 3101,3107 **** +*** 3105,3111 **** if(outgoing->return_path) mail_free_address(&outgoing->return_path); @@ -41,7 +41,7 @@ diff -rc alpine-2.22/alpine/send.c alpine-2.22.fromheader/alpine/send.c /* * Don't ever believe the sender that is there. ---- 3106,3114 ---- +--- 3110,3118 ---- if(outgoing->return_path) mail_free_address(&outgoing->return_path); @@ -51,12 +51,12 @@ diff -rc alpine-2.22/alpine/send.c alpine-2.22.fromheader/alpine/send.c /* * Don't ever believe the sender that is there. -diff -rc alpine-2.22/pith/conf.c alpine-2.22.fromheader/pith/conf.c -*** alpine-2.22/pith/conf.c 2020-01-19 01:32:18.678505766 -0700 ---- alpine-2.22.fromheader/pith/conf.c 2020-01-19 01:34:53.918466178 -0700 +diff -rc alpine-2.23/pith/conf.c alpine-2.23.fromheader/pith/conf.c +*** alpine-2.23/pith/conf.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fromheader/pith/conf.c 2020-06-18 16:08:13.005590716 -0600 *************** -*** 2908,2913 **** ---- 2908,2915 ---- +*** 2930,2935 **** +--- 2930,2937 ---- F_NO_FCC_ATTACH, h_config_no_fcc_attach, PREF_SEND, 0}, {"fcc-on-bounce", "Include Fcc When Bouncing Messages", F_FCC_ON_BOUNCE, h_config_fcc_on_bounce, PREF_SEND, 0}, @@ -65,12 +65,12 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.fromheader/pith/conf.c {"mark-fcc-seen", NULL, F_MARK_FCC_SEEN, h_config_mark_fcc_seen, PREF_SEND, 0}, {"fcc-only-without-confirm", "Send to Fcc Only Without Confirming", -diff -rc alpine-2.22/pith/conftype.h alpine-2.22.fromheader/pith/conftype.h -*** alpine-2.22/pith/conftype.h 2020-01-19 01:32:18.702505283 -0700 ---- alpine-2.22.fromheader/pith/conftype.h 2020-01-19 01:34:53.919466170 -0700 +diff -rc alpine-2.23/pith/conftype.h alpine-2.23.fromheader/pith/conftype.h +*** alpine-2.23/pith/conftype.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fromheader/pith/conftype.h 2020-06-18 16:08:13.009590727 -0600 *************** -*** 404,409 **** ---- 404,410 ---- +*** 410,415 **** +--- 410,416 ---- F_AUTO_REPLY_TO, F_VERBOSE_POST, F_FCC_ON_BOUNCE, @@ -78,12 +78,12 @@ diff -rc alpine-2.22/pith/conftype.h alpine-2.22.fromheader/pith/conftype.h F_SEND_WO_CONFIRM, F_USE_SENDER_NOT_X, F_BLANK_KEYMENU, -diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fromheader/pith/pine.hlp -*** alpine-2.22/pith/pine.hlp 2020-01-19 01:32:19.035498584 -0700 ---- alpine-2.22.fromheader/pith/pine.hlp 2020-01-19 01:34:53.931466081 -0700 +diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.fromheader/pith/pine.hlp +*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fromheader/pith/pine.hlp 2020-06-18 16:08:13.017590747 -0600 *************** -*** 29530,29535 **** ---- 29530,29551 ---- +*** 29697,29702 **** +--- 29697,29718 ---- <End of help on this topic> @@ -106,9 +106,9 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.fromheader/pith/pine.hlp ====== h_config_use_sender_not_x ===== -diff -rc alpine-2.22/pith/send.c alpine-2.22.fromheader/pith/send.c -*** alpine-2.22/pith/send.c 2020-01-19 01:32:18.956500171 -0700 ---- alpine-2.22.fromheader/pith/send.c 2020-01-19 01:34:53.934466058 -0700 +diff -rc alpine-2.23/pith/send.c alpine-2.23.fromheader/pith/send.c +*** alpine-2.23/pith/send.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fromheader/pith/send.c 2020-06-18 16:08:13.017590747 -0600 *************** *** 53,59 **** /* name::type::canedit::writehdr::localcopy::rcptto */ @@ -143,9 +143,9 @@ diff -rc alpine-2.22/pith/send.c alpine-2.22.fromheader/pith/send.c pf->rcptto = pf_template[i].rcptto; pf->writehdr = pf_template[i].writehdr; pf->localcopy = pf_template[i].localcopy; -diff -rc alpine-2.22/pith/send.h alpine-2.22.fromheader/pith/send.h -*** alpine-2.22/pith/send.h 2020-01-19 01:32:19.354492198 -0700 ---- alpine-2.22.fromheader/pith/send.h 2020-01-19 01:34:53.934466058 -0700 +diff -rc alpine-2.23/pith/send.h alpine-2.23.fromheader/pith/send.h +*** alpine-2.23/pith/send.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.fromheader/pith/send.h 2020-06-18 16:08:13.017590747 -0600 *************** *** 159,164 **** --- 159,166 ---- diff --git a/chappa-insertpat.patch b/chappa-insertpat.patch index ae38de0..0a6001a 100644 --- a/chappa-insertpat.patch +++ b/chappa-insertpat.patch @@ -1,6 +1,6 @@ -diff -rc alpine-2.22/pico/display.c alpine-2.22.insertpat/pico/display.c -*** alpine-2.22/pico/display.c 2020-01-19 01:32:18.428510798 -0700 ---- alpine-2.22.insertpat/pico/display.c 2020-01-19 01:34:56.194449394 -0700 +diff -rc alpine-2.23/pico/display.c alpine-2.23.insertpat/pico/display.c +*** alpine-2.23/pico/display.c 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.insertpat/pico/display.c 2020-06-18 16:08:14.569594756 -0600 *************** *** 2205,2210 **** --- 2205,2222 ---- @@ -22,9 +22,9 @@ diff -rc alpine-2.22/pico/display.c alpine-2.22.insertpat/pico/display.c case (CTRL|'G') : /* CTRL-G help */ if(term.t_mrow == 0 && km_popped == 0){ movecursor(term.t_nrow-2, 0); -diff -rc alpine-2.22/pico/search.c alpine-2.22.insertpat/pico/search.c -*** alpine-2.22/pico/search.c 2020-01-19 01:32:18.347512428 -0700 ---- alpine-2.22.insertpat/pico/search.c 2020-01-19 01:34:56.195449387 -0700 +diff -rc alpine-2.23/pico/search.c alpine-2.23.insertpat/pico/search.c +*** alpine-2.23/pico/search.c 2020-06-18 15:19:23.437319046 -0600 +--- alpine-2.23.insertpat/pico/search.c 2020-06-18 16:08:14.569594756 -0600 *************** *** 122,127 **** --- 122,131 ---- diff --git a/chappa-maildir.patch b/chappa-maildir.patch index 620fbc0..35ee191 100644 --- a/chappa-maildir.patch +++ b/chappa-maildir.patch @@ -1,9 +1,9 @@ -diff -rc alpine-2.22/alpine/alpine.c alpine-2.22.maildir/alpine/alpine.c -*** alpine-2.22/alpine/alpine.c 2020-01-19 01:32:20.090477474 -0700 ---- alpine-2.22.maildir/alpine/alpine.c 2020-01-19 01:34:47.848512457 -0700 +diff -rc alpine-2.23/alpine/alpine.c alpine-2.23.maildir/alpine/alpine.c +*** alpine-2.23/alpine/alpine.c 2020-06-18 15:19:23.469318992 -0600 +--- alpine-2.23.maildir/alpine/alpine.c 2020-06-18 16:08:07.725577079 -0600 *************** -*** 591,596 **** ---- 591,601 ---- +*** 597,602 **** +--- 597,607 ---- if(F_ON(F_MAILDROPS_PRESERVE_STATE, ps_global)) mail_parameters(NULL, SET_SNARFPRESERVE, (void *) TRUE); @@ -15,12 +15,12 @@ diff -rc alpine-2.22/alpine/alpine.c alpine-2.22.maildir/alpine/alpine.c rvl = 0L; if(pine_state->VAR_NNTPRANGE){ if(!SVAR_NNTPRANGE(pine_state, rvl, tmp_20k_buf, SIZEOF_20KBUF)) -diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.maildir/alpine/confscroll.c -*** alpine-2.22/alpine/confscroll.c 2020-01-19 01:32:20.190475483 -0700 ---- alpine-2.22.maildir/alpine/confscroll.c 2020-01-19 01:34:47.850512441 -0700 +diff -rc alpine-2.23/alpine/confscroll.c alpine-2.23.maildir/alpine/confscroll.c +*** alpine-2.23/alpine/confscroll.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.maildir/alpine/confscroll.c 2020-06-18 16:08:07.729577089 -0600 *************** -*** 5557,5562 **** ---- 5557,5568 ---- +*** 5546,5551 **** +--- 5546,5557 ---- (void *)var->current_val.p); } #endif @@ -33,11 +33,11 @@ diff -rc alpine-2.22/alpine/confscroll.c alpine-2.22.maildir/alpine/confscroll.c else if(revert && standard_radio_var(ps, var)){ cur_rule_value(var, TRUE, FALSE); -diff -rc alpine-2.22/imap/src/c-client/mail.c alpine-2.22.maildir/imap/src/c-client/mail.c -*** alpine-2.22/imap/src/c-client/mail.c 2020-01-19 01:32:23.162416684 -0700 ---- alpine-2.22.maildir/imap/src/c-client/mail.c 2020-01-19 01:34:48.243509380 -0700 +diff -rc alpine-2.23/imap/src/c-client/mail.c alpine-2.23.maildir/imap/src/c-client/mail.c +*** alpine-2.23/imap/src/c-client/mail.c 2020-06-18 15:19:23.457319012 -0600 +--- alpine-2.23.maildir/imap/src/c-client/mail.c 2020-06-18 16:08:07.729577089 -0600 *************** -*** 1046,1052 **** +*** 1053,1059 **** MAILSTREAM *ts; char *s,*t,tmp[MAILTMPLEN]; size_t i; @@ -45,7 +45,7 @@ diff -rc alpine-2.22/imap/src/c-client/mail.c alpine-2.22.maildir/imap/src/c-cli /* never allow names with newlines */ if ((s = strpbrk (mailbox,"\015\012")) != NULL) { MM_LOG ("Can't create mailbox with such a name",ERROR); ---- 1046,1052 ---- +--- 1053,1059 ---- MAILSTREAM *ts; char *s,*t,tmp[MAILTMPLEN]; size_t i; @@ -54,8 +54,8 @@ diff -rc alpine-2.22/imap/src/c-client/mail.c alpine-2.22.maildir/imap/src/c-cli if ((s = strpbrk (mailbox,"\015\012")) != NULL) { MM_LOG ("Can't create mailbox with such a name",ERROR); *************** -*** 1070,1075 **** ---- 1070,1077 ---- +*** 1077,1082 **** +--- 1077,1084 ---- return NIL; } @@ -65,8 +65,8 @@ diff -rc alpine-2.22/imap/src/c-client/mail.c alpine-2.22.maildir/imap/src/c-cli if ((mailbox[0] == '#') && ((mailbox[1] == 'd') || (mailbox[1] == 'D')) && ((mailbox[2] == 'r') || (mailbox[2] == 'R')) && *************** -*** 1100,1105 **** ---- 1102,1114 ---- +*** 1107,1112 **** +--- 1109,1121 ---- (((*mailbox == '{') || (*mailbox == '#')) && (stream = mail_open (NIL,mailbox,OP_PROTOTYPE | OP_SILENT)))) d = stream->dtb; @@ -80,12 +80,12 @@ diff -rc alpine-2.22/imap/src/c-client/mail.c alpine-2.22.maildir/imap/src/c-cli else if ((*mailbox != '{') && (ts = default_proto (NIL))) d = ts->dtb; else { /* failed utterly */ sprintf (tmp,"Can't create mailbox %.80s: indeterminate format",mailbox); -diff -rc alpine-2.22/imap/src/c-client/mail.h alpine-2.22.maildir/imap/src/c-client/mail.h -*** alpine-2.22/imap/src/c-client/mail.h 2020-01-19 01:32:23.166416605 -0700 ---- alpine-2.22.maildir/imap/src/c-client/mail.h 2020-01-19 01:34:48.244509372 -0700 +diff -rc alpine-2.23/imap/src/c-client/mail.h alpine-2.23.maildir/imap/src/c-client/mail.h +*** alpine-2.23/imap/src/c-client/mail.h 2020-06-18 15:19:23.457319012 -0600 +--- alpine-2.23.maildir/imap/src/c-client/mail.h 2020-06-18 16:08:07.729577089 -0600 *************** -*** 374,379 **** ---- 374,383 ---- +*** 379,384 **** +--- 379,388 ---- #define SET_SCANCONTENTS (long) 573 #define GET_MHALLOWINBOX (long) 574 #define SET_MHALLOWINBOX (long) 575 @@ -96,9 +96,9 @@ diff -rc alpine-2.22/imap/src/c-client/mail.h alpine-2.22.maildir/imap/src/c-cli /* Driver flags */ -diff -rc alpine-2.22/imap/src/osdep/unix/dummy.c alpine-2.22.maildir/imap/src/osdep/unix/dummy.c -*** alpine-2.22/imap/src/osdep/unix/dummy.c 2020-01-19 01:32:22.660426553 -0700 ---- alpine-2.22.maildir/imap/src/osdep/unix/dummy.c 2020-01-19 01:34:48.245509364 -0700 +diff -rc alpine-2.23/imap/src/osdep/unix/dummy.c alpine-2.23.maildir/imap/src/osdep/unix/dummy.c +*** alpine-2.23/imap/src/osdep/unix/dummy.c 2020-06-18 15:19:23.449319026 -0600 +--- alpine-2.23.maildir/imap/src/osdep/unix/dummy.c 2020-06-18 16:08:07.729577089 -0600 *************** *** 103,115 **** * Accepts: mailbox name @@ -253,9 +253,9 @@ diff -rc alpine-2.22/imap/src/osdep/unix/dummy.c alpine-2.22.maildir/imap/src/os return T; /* return success */ } -diff -rc alpine-2.22/imap/src/osdep/unix/maildir.c alpine-2.22.maildir/imap/src/osdep/unix/maildir.c -*** alpine-2.22/imap/src/osdep/unix/maildir.c 2020-01-19 01:34:48.437507873 -0700 ---- alpine-2.22.maildir/imap/src/osdep/unix/maildir.c 2020-01-19 01:34:48.249509333 -0700 +diff -rc alpine-2.23/imap/src/osdep/unix/maildir.c alpine-2.23.maildir/imap/src/osdep/unix/maildir.c +*** alpine-2.23/imap/src/osdep/unix/maildir.c 2020-06-18 16:08:07.773577203 -0600 +--- alpine-2.23.maildir/imap/src/osdep/unix/maildir.c 2020-06-18 16:08:07.733577099 -0600 *************** *** 0 **** --- 1,2671 ---- @@ -2930,9 +2930,9 @@ diff -rc alpine-2.22/imap/src/osdep/unix/maildir.c alpine-2.22.maildir/imap/src/ + LOCAL->uidtempfile = cpystr(tmp); + } + } -diff -rc alpine-2.22/imap/src/osdep/unix/maildir.h alpine-2.22.maildir/imap/src/osdep/unix/maildir.h -*** alpine-2.22/imap/src/osdep/unix/maildir.h 2020-01-19 01:34:48.439507857 -0700 ---- alpine-2.22.maildir/imap/src/osdep/unix/maildir.h 2020-01-19 01:34:48.250509325 -0700 +diff -rc alpine-2.23/imap/src/osdep/unix/maildir.h alpine-2.23.maildir/imap/src/osdep/unix/maildir.h +*** alpine-2.23/imap/src/osdep/unix/maildir.h 2020-06-18 16:08:07.777577213 -0600 +--- alpine-2.23.maildir/imap/src/osdep/unix/maildir.h 2020-06-18 16:08:07.733577099 -0600 *************** *** 0 **** --- 1,226 ---- @@ -3162,11 +3162,11 @@ diff -rc alpine-2.22/imap/src/osdep/unix/maildir.h alpine-2.22.maildir/imap/src/ + void maildir_assign_uid(MAILSTREAM *stream, unsigned long msgno, unsigned long uid); + void maildir_uid_renew_tempfile(MAILSTREAM *stream); + -diff -rc alpine-2.22/imap/src/osdep/unix/Makefile alpine-2.22.maildir/imap/src/osdep/unix/Makefile -*** alpine-2.22/imap/src/osdep/unix/Makefile 2020-01-19 01:32:22.615427440 -0700 ---- alpine-2.22.maildir/imap/src/osdep/unix/Makefile 2020-01-19 01:34:48.250509325 -0700 +diff -rc alpine-2.23/imap/src/osdep/unix/Makefile alpine-2.23.maildir/imap/src/osdep/unix/Makefile +*** alpine-2.23/imap/src/osdep/unix/Makefile 2020-06-18 15:19:23.453319019 -0600 +--- alpine-2.23.maildir/imap/src/osdep/unix/Makefile 2020-06-18 16:08:07.733577099 -0600 *************** -*** 147,153 **** +*** 146,152 **** # However, mh needs to be before any sysinbox formats (such as mmdf or unix) # since otherwise INBOX won't work correctly when mh_allow_inbox is set. # @@ -3174,7 +3174,7 @@ diff -rc alpine-2.22/imap/src/osdep/unix/Makefile alpine-2.22.maildir/imap/src/o CHUNKSIZE=65536 # Normally no need to change any of these ---- 147,153 ---- +--- 146,152 ---- # However, mh needs to be before any sysinbox formats (such as mmdf or unix) # since otherwise INBOX won't work correctly when mh_allow_inbox is set. # @@ -3183,7 +3183,7 @@ diff -rc alpine-2.22/imap/src/osdep/unix/Makefile alpine-2.22.maildir/imap/src/o # Normally no need to change any of these *************** -*** 156,162 **** +*** 155,161 **** BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o http.o json.o pop3.o \ @@ -3191,7 +3191,7 @@ diff -rc alpine-2.22/imap/src/osdep/unix/Makefile alpine-2.22.maildir/imap/src/o CFLAGS=-g CAT=cat ---- 156,162 ---- +--- 155,161 ---- BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o http.o json.o pop3.o \ @@ -3200,7 +3200,7 @@ diff -rc alpine-2.22/imap/src/osdep/unix/Makefile alpine-2.22.maildir/imap/src/o CAT=cat *************** -*** 293,299 **** +*** 292,298 **** cyg: # Cygwin - note that most local file drivers don't work!! $(BUILD) `$(CAT) SPECIALS` OS=$@ \ @@ -3208,7 +3208,7 @@ diff -rc alpine-2.22/imap/src/osdep/unix/Makefile alpine-2.22.maildir/imap/src/o SIGTYPE=psx CHECKPW=cyg LOGINPW=cyg CRXTYPE=std \ SPOOLDIR=/var \ ACTIVEFILE=/usr/local/news/lib/active \ ---- 293,299 ---- +--- 292,298 ---- cyg: # Cygwin - note that most local file drivers don't work!! $(BUILD) `$(CAT) SPECIALS` OS=$@ \ @@ -3217,8 +3217,8 @@ diff -rc alpine-2.22/imap/src/osdep/unix/Makefile alpine-2.22.maildir/imap/src/o SPOOLDIR=/var \ ACTIVEFILE=/usr/local/news/lib/active \ *************** -*** 922,927 **** ---- 922,928 ---- +*** 921,926 **** +--- 921,927 ---- utf8aux.o: mail.h misc.h osdep.h utf8.h json.o: mail.h misc.h osdep.h utf8.h json.h http.o: mail.h misc.h osdep.h utf8.h http.h json.h @@ -3226,9 +3226,9 @@ diff -rc alpine-2.22/imap/src/osdep/unix/Makefile alpine-2.22.maildir/imap/src/o # OS-dependent -diff -rc alpine-2.22/imap/src/osdep/unix/os_cyg.h alpine-2.22.maildir/imap/src/osdep/unix/os_cyg.h -*** alpine-2.22/imap/src/osdep/unix/os_cyg.h 2020-01-19 01:32:22.664426475 -0700 ---- alpine-2.22.maildir/imap/src/osdep/unix/os_cyg.h 2020-01-19 01:34:48.251509318 -0700 +diff -rc alpine-2.23/imap/src/osdep/unix/os_cyg.h alpine-2.23.maildir/imap/src/osdep/unix/os_cyg.h +*** alpine-2.23/imap/src/osdep/unix/os_cyg.h 2020-06-18 15:19:23.449319026 -0600 +--- alpine-2.23.maildir/imap/src/osdep/unix/os_cyg.h 2020-06-18 16:08:07.733577099 -0600 *************** *** 47,52 **** --- 47,53 ---- @@ -3239,12 +3239,12 @@ diff -rc alpine-2.22/imap/src/osdep/unix/os_cyg.h alpine-2.22.maildir/imap/src/o #define geteuid Geteuid uid_t Geteuid (void); -diff -rc alpine-2.22/pith/conf.c alpine-2.22.maildir/pith/conf.c -*** alpine-2.22/pith/conf.c 2020-01-19 01:32:18.678505766 -0700 ---- alpine-2.22.maildir/pith/conf.c 2020-01-19 01:34:48.253509302 -0700 +diff -rc alpine-2.23/pith/conf.c alpine-2.23.maildir/pith/conf.c +*** alpine-2.23/pith/conf.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.maildir/pith/conf.c 2020-06-18 16:08:07.737577110 -0600 *************** -*** 443,448 **** ---- 443,451 ---- +*** 449,454 **** +--- 449,457 ---- CONF_TXT_T cf_text_newsrc_path[] = "Full path and name of NEWSRC file"; @@ -3255,8 +3255,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.maildir/pith/conf.c /*---------------------------------------------------------------------- These are the variables that control a number of pine functions. They *************** -*** 649,654 **** ---- 652,661 ---- +*** 653,658 **** +--- 656,665 ---- NULL, cf_text_news_active}, {"news-spool-directory", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_news_spooldir}, @@ -3268,8 +3268,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.maildir/pith/conf.c NULL, cf_text_upload_cmd}, {"upload-command-prefix", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, *************** -*** 2322,2327 **** ---- 2329,2340 ---- +*** 2338,2343 **** +--- 2345,2356 ---- mail_parameters(NULL, SET_NEWSSPOOL, (void *)VAR_NEWS_SPOOL_DIR); @@ -3283,8 +3283,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.maildir/pith/conf.c set_current_val(&vars[V_DEFAULT_SAVE_FOLDER], TRUE, TRUE); if(!VAR_DEFAULT_SAVE_FOLDER || !VAR_DEFAULT_SAVE_FOLDER[0]) *************** -*** 2954,2959 **** ---- 2967,2976 ---- +*** 2976,2981 **** +--- 2989,2998 ---- F_SORT_DEFAULT_SAVE_ALPHA, h_config_sort_save_alpha, PREF_FLDR, 0}, {"vertical-folder-list", "Use Vertical Folder List", F_VERTICAL_FOLDER_LIST, h_config_vertical_list, PREF_FLDR, 0}, @@ -3296,7 +3296,7 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.maildir/pith/conf.c /* Addr book */ {"combined-addrbook-display", "Combined Address Book Display", *************** -*** 7068,7074 **** +*** 7124,7130 **** int just_flip_value, EditWhich ew) { char **vp, *p, **lval, ***alval; @@ -3304,7 +3304,7 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.maildir/pith/conf.c char *err; long l; ---- 7085,7091 ---- +--- 7141,7147 ---- int just_flip_value, EditWhich ew) { char **vp, *p, **lval, ***alval; @@ -3313,8 +3313,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.maildir/pith/conf.c long l; *************** -*** 7121,7126 **** ---- 7138,7150 ---- +*** 7177,7182 **** +--- 7194,7206 ---- break; @@ -3329,8 +3329,8 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.maildir/pith/conf.c case F_DATES_TO_LOCAL : clear_index_cache(ps->mail_stream, 0); *************** -*** 7911,7916 **** ---- 7935,7944 ---- +*** 7975,7980 **** +--- 7999,8008 ---- return(h_config_newmailwidth); case V_NEWSRC_PATH : return(h_config_newsrc_path); @@ -3341,12 +3341,12 @@ diff -rc alpine-2.22/pith/conf.c alpine-2.22.maildir/pith/conf.c case V_BROWSER : return(h_config_browser); case V_HISTORY : -diff -rc alpine-2.22/pith/conf.h alpine-2.22.maildir/pith/conf.h -*** alpine-2.22/pith/conf.h 2020-01-19 01:32:19.489489496 -0700 ---- alpine-2.22.maildir/pith/conf.h 2020-01-19 01:34:48.277509116 -0700 +diff -rc alpine-2.23/pith/conf.h alpine-2.23.maildir/pith/conf.h +*** alpine-2.23/pith/conf.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.maildir/pith/conf.h 2020-06-18 16:08:07.737577110 -0600 *************** -*** 256,261 **** ---- 256,265 ---- +*** 260,265 **** +--- 260,269 ---- #define GLO_NEWS_ACTIVE_PATH vars[V_NEWS_ACTIVE_PATH].global_val.p #define VAR_NEWS_SPOOL_DIR vars[V_NEWS_SPOOL_DIR].current_val.p #define GLO_NEWS_SPOOL_DIR vars[V_NEWS_SPOOL_DIR].global_val.p @@ -3357,12 +3357,12 @@ diff -rc alpine-2.22/pith/conf.h alpine-2.22.maildir/pith/conf.h #define VAR_DISABLE_DRIVERS vars[V_DISABLE_DRIVERS].current_val.l #define VAR_DISABLE_AUTHS vars[V_DISABLE_AUTHS].current_val.l #define VAR_REMOTE_ABOOK_METADATA vars[V_REMOTE_ABOOK_METADATA].current_val.p -diff -rc alpine-2.22/pith/conftype.h alpine-2.22.maildir/pith/conftype.h -*** alpine-2.22/pith/conftype.h 2020-01-19 01:32:18.702505283 -0700 ---- alpine-2.22.maildir/pith/conftype.h 2020-01-19 01:34:48.278509108 -0700 +diff -rc alpine-2.23/pith/conftype.h alpine-2.23.maildir/pith/conftype.h +*** alpine-2.23/pith/conftype.h 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.maildir/pith/conftype.h 2020-06-18 16:08:07.737577110 -0600 *************** -*** 119,124 **** ---- 119,127 ---- +*** 118,123 **** +--- 118,126 ---- , V_NEWSRC_PATH , V_NEWS_ACTIVE_PATH , V_NEWS_SPOOL_DIR @@ -3373,8 +3373,8 @@ diff -rc alpine-2.22/pith/conftype.h alpine-2.22.maildir/pith/conftype.h , V_UPLOAD_CMD_PREFIX , V_DOWNLOAD_CMD *************** -*** 400,405 **** ---- 403,411 ---- +*** 406,411 **** +--- 409,417 ---- F_PASS_C1_CONTROL_CHARS, F_SINGLE_FOLDER_LIST, F_VERTICAL_FOLDER_LIST, @@ -3384,9 +3384,9 @@ diff -rc alpine-2.22/pith/conftype.h alpine-2.22.maildir/pith/conftype.h F_TAB_CHK_RECENT, F_AUTO_REPLY_TO, F_VERBOSE_POST, -diff -rc alpine-2.22/pith/init.c alpine-2.22.maildir/pith/init.c -*** alpine-2.22/pith/init.c 2020-01-19 01:32:18.764504035 -0700 ---- alpine-2.22.maildir/pith/init.c 2020-01-19 01:34:48.278509108 -0700 +diff -rc alpine-2.23/pith/init.c alpine-2.23.maildir/pith/init.c +*** alpine-2.23/pith/init.c 2020-06-18 15:19:23.465318999 -0600 +--- alpine-2.23.maildir/pith/init.c 2020-06-18 16:08:07.737577110 -0600 *************** *** 408,413 **** --- 408,416 ---- @@ -3399,9 +3399,9 @@ diff -rc alpine-2.22/pith/init.c alpine-2.22.maildir/pith/init.c && strcmp(filename, folder_base)){ #endif #endif -diff -rc alpine-2.22/pith/pattern.c alpine-2.22.maildir/pith/pattern.c -*** alpine-2.22/pith/pattern.c 2020-01-19 01:32:19.260494080 -0700 ---- alpine-2.22.maildir/pith/pattern.c 2020-01-19 01:34:48.281509085 -0700 +diff -rc alpine-2.23/pith/pattern.c alpine-2.23.maildir/pith/pattern.c +*** alpine-2.23/pith/pattern.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.maildir/pith/pattern.c 2020-06-18 16:08:07.741577120 -0600 *************** *** 49,55 **** #include "../pith/icache.h" @@ -3489,12 +3489,12 @@ diff -rc alpine-2.22/pith/pattern.c alpine-2.22.maildir/pith/pattern.c return(buf[0] != '\0'); } -diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.maildir/pith/pine.hlp -*** alpine-2.22/pith/pine.hlp 2020-01-19 01:32:19.035498584 -0700 ---- alpine-2.22.maildir/pith/pine.hlp 2020-01-19 01:34:48.306508890 -0700 +diff -rc alpine-2.23/pith/pine.hlp alpine-2.23.maildir/pith/pine.hlp +*** alpine-2.23/pith/pine.hlp 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.maildir/pith/pine.hlp 2020-06-18 16:08:07.749577141 -0600 *************** -*** 22897,22902 **** ---- 22897,22998 ---- +*** 23014,23019 **** +--- 23014,23115 ---- <End of help on this topic> @@ -3598,8 +3598,8 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.maildir/pith/pine.hlp *************** -*** 31036,31041 **** ---- 31132,31180 ---- +*** 31245,31250 **** +--- 31341,31389 ----

    <End of help on this topic> @@ -3649,9 +3649,9 @@ diff -rc alpine-2.22/pith/pine.hlp alpine-2.22.maildir/pith/pine.hlp ====== h_config_verbose_post ===== -diff -rc alpine-2.22/pith/send.c alpine-2.22.maildir/pith/send.c -*** alpine-2.22/pith/send.c 2020-01-19 01:32:18.956500171 -0700 ---- alpine-2.22.maildir/pith/send.c 2020-01-19 01:34:48.420508005 -0700 +diff -rc alpine-2.23/pith/send.c alpine-2.23.maildir/pith/send.c +*** alpine-2.23/pith/send.c 2020-06-18 15:19:23.461319005 -0600 +--- alpine-2.23.maildir/pith/send.c 2020-06-18 16:08:07.761577172 -0600 *************** *** 47,52 **** --- 47,55 ---- @@ -3680,9 +3680,9 @@ diff -rc alpine-2.22/pith/send.c alpine-2.22.maildir/pith/send.c if(!(IS_REMOTE(tmp) || is_absolute_path(tmp))){ /* * The mbox is relative to the home directory. -diff -rc alpine-2.22/README.maildir alpine-2.22.maildir/README.maildir -*** alpine-2.22/README.maildir 2020-01-19 01:34:48.441507842 -0700 ---- alpine-2.22.maildir/README.maildir 2020-01-19 01:34:48.421507997 -0700 +diff -rc alpine-2.23/README.maildir alpine-2.23.maildir/README.maildir +*** alpine-2.23/README.maildir 2020-06-18 16:08:07.777577213 -0600 +--- alpine-2.23.maildir/README.maildir 2020-06-18 16:08:07.761577172 -0600 *************** *** 0 **** --- 1,149 ---- diff --git a/chappa-rules.patch b/chappa-rules.patch index cd1b8e6..f0c5f56 100644 --- a/chappa-rules.patch +++ b/chappa-rules.patch @@ -7,7 +7,8 @@ alpine/folder.c | 3 alpine/mailcmd.c | 18 alpine/mailindx.c | 6 - alpine/mailview.c | 2 + alpine/mailpart.c | 12 + alpine/mailview.c | 4 alpine/osdep/termin.gen.c | 41 + alpine/reply.c | 102 ++ alpine/roleconf.c | 5 @@ -22,7 +23,7 @@ pith/indxtype.h | 34 pith/mailcmd.c | 435 +++++++++--- pith/mailcmd.h | 8 - pith/mailindx.c | 336 +++++++-- + pith/mailindx.c | 340 +++++++-- pith/mailindx.h | 3 pith/makefile.wnt | 5 pith/pine.hlp | 1150 +++++++++++++++++++++++++++++++++ @@ -32,18 +33,18 @@ pith/rulestype.h | 94 ++ pith/save.c | 2 pith/send.c | 58 + - pith/sort.c | 56 + + pith/sort.c | 54 + pith/sort.h | 2 pith/state.c | 4 pith/state.h | 11 pith/string.c | 58 + pith/string.h | 2 - 39 files changed, 4473 insertions(+), 295 deletions(-) + 40 files changed, 4487 insertions(+), 297 deletions(-) -Index: alpine-2.22/alpine/adrbkcmd.c +Index: alpine-2.23/alpine/adrbkcmd.c =================================================================== ---- alpine-2.22.orig/alpine/adrbkcmd.c -+++ alpine-2.22/alpine/adrbkcmd.c +--- alpine-2.23.orig/alpine/adrbkcmd.c ++++ alpine-2.23/alpine/adrbkcmd.c @@ -4128,6 +4128,8 @@ ab_compose_internal(BuildTo bldto, int a * won't do anything, but will cause compose_mail to think there's * already a role so that it won't try to confirm the default. @@ -61,11 +62,11 @@ Index: alpine-2.22/alpine/adrbkcmd.c } compose_mail(addr, fcc, role, NULL, NULL); -Index: alpine-2.22/alpine/alpine.c +Index: alpine-2.23/alpine/alpine.c =================================================================== ---- alpine-2.22.orig/alpine/alpine.c -+++ alpine-2.22/alpine/alpine.c -@@ -500,6 +500,7 @@ main(int argc, char **argv) +--- alpine-2.23.orig/alpine/alpine.c ++++ alpine-2.23/alpine/alpine.c +@@ -506,6 +506,7 @@ main(int argc, char **argv) /* Set up optional for user-defined display filtering */ pine_state->tools.display_filter = dfilter; pine_state->tools.display_filter_trigger = dfilter_trigger; @@ -73,7 +74,7 @@ Index: alpine-2.22/alpine/alpine.c #ifdef _WINDOWS if(ps_global->install_flag){ -@@ -3270,6 +3271,9 @@ goodnight_gracey(struct pine *pine_state +@@ -3274,6 +3275,9 @@ goodnight_gracey(struct pine *pine_state extern KBESC_T *kbesc; dprint((2, "goodnight_gracey:\n")); @@ -83,10 +84,10 @@ Index: alpine-2.22/alpine/alpine.c /* We want to do this here before we close up the streams */ trim_remote_adrbks(); -Index: alpine-2.22/alpine/confscroll.c +Index: alpine-2.23/alpine/confscroll.c =================================================================== ---- alpine-2.22.orig/alpine/confscroll.c -+++ alpine-2.22/alpine/confscroll.c +--- alpine-2.23.orig/alpine/confscroll.c ++++ alpine-2.23/alpine/confscroll.c @@ -51,6 +51,7 @@ static char rcsid[] = "$Id: confscroll.c #include "../pith/tempfile.h" #include "../pith/pattern.h" @@ -95,7 +96,7 @@ Index: alpine-2.22/alpine/confscroll.c #define CONFIG_SCREEN_HELP_TITLE _("HELP FOR SETUP CONFIGURATION") -@@ -2443,6 +2444,9 @@ delete: +@@ -2442,6 +2443,9 @@ delete: * Now go and set the current_val based on user_val changes * above. Turn off command line settings... */ @@ -105,7 +106,7 @@ Index: alpine-2.22/alpine/confscroll.c set_current_val((*cl)->var, TRUE, FALSE); fix_side_effects(ps, (*cl)->var, 0); -@@ -5240,6 +5244,35 @@ fix_side_effects(struct pine *ps, struct +@@ -5239,6 +5243,35 @@ fix_side_effects(struct pine *ps, struct var == &ps->vars[V_ABOOK_FORMATS]){ addrbook_reset(); } @@ -141,10 +142,10 @@ Index: alpine-2.22/alpine/confscroll.c else if(var == &ps->vars[V_INDEX_FORMAT]){ reset_index_format(); clear_index_cache(ps->mail_stream, 0); -Index: alpine-2.22/alpine/dispfilt.c +Index: alpine-2.23/alpine/dispfilt.c =================================================================== ---- alpine-2.22.orig/alpine/dispfilt.c -+++ alpine-2.22/alpine/dispfilt.c +--- alpine-2.23.orig/alpine/dispfilt.c ++++ alpine-2.23/alpine/dispfilt.c @@ -461,3 +461,63 @@ df_valid_test(struct mail_bodystruct *bo return(passed); @@ -209,10 +210,10 @@ Index: alpine-2.22/alpine/dispfilt.c + + return(status); +} -Index: alpine-2.22/alpine/dispfilt.h +Index: alpine-2.23/alpine/dispfilt.h =================================================================== ---- alpine-2.22.orig/alpine/dispfilt.h -+++ alpine-2.22/alpine/dispfilt.h +--- alpine-2.23.orig/alpine/dispfilt.h ++++ alpine-2.23/alpine/dispfilt.h @@ -25,7 +25,7 @@ char *dfilter_trigger(BODY *, char *, si char *expand_filter_tokens(char *, ENVELOPE *, char **, char **, char **, int *, int *, int *); char *filter_session_key(void); @@ -222,10 +223,10 @@ Index: alpine-2.22/alpine/dispfilt.h #endif /* PINE_DISPFILT_INCLUDED */ -Index: alpine-2.22/alpine/folder.c +Index: alpine-2.23/alpine/folder.c =================================================================== ---- alpine-2.22.orig/alpine/folder.c -+++ alpine-2.22/alpine/folder.c +--- alpine-2.23.orig/alpine/folder.c ++++ alpine-2.23/alpine/folder.c @@ -248,7 +248,7 @@ folder_screen(struct pine *ps) dprint((1, "=== folder_screen called ====\n")); mailcap_free(); /* free resources we won't be using for a while */ @@ -243,10 +244,10 @@ Index: alpine-2.22/alpine/folder.c } -Index: alpine-2.22/alpine/mailcmd.c +Index: alpine-2.23/alpine/mailcmd.c =================================================================== ---- alpine-2.22.orig/alpine/mailcmd.c -+++ alpine-2.22/alpine/mailcmd.c +--- alpine-2.23.orig/alpine/mailcmd.c ++++ alpine-2.23/alpine/mailcmd.c @@ -73,6 +73,7 @@ static char rcsid[] = "$Id: mailcmd.c 12 #include "../pith/tempfile.h" #include "../pith/search.h" @@ -304,10 +305,10 @@ Index: alpine-2.22/alpine/mailcmd.c /* how many context's can be saved to... */ for(tc = state->context_list; tc; tc = tc->next) if(!NEWS_TEST(tc)) -Index: alpine-2.22/alpine/mailindx.c +Index: alpine-2.23/alpine/mailindx.c =================================================================== ---- alpine-2.22.orig/alpine/mailindx.c -+++ alpine-2.22/alpine/mailindx.c +--- alpine-2.23.orig/alpine/mailindx.c ++++ alpine-2.23/alpine/mailindx.c @@ -229,6 +229,8 @@ mail_index_screen(struct pine *state) state->prev_screen = mail_index_screen; state->next_screen = SCREEN_FUN_NULL; @@ -332,11 +333,48 @@ Index: alpine-2.22/alpine/mailindx.c } -Index: alpine-2.22/alpine/mailview.c +Index: alpine-2.23/alpine/mailpart.c =================================================================== ---- alpine-2.22.orig/alpine/mailview.c -+++ alpine-2.22/alpine/mailview.c -@@ -251,6 +251,8 @@ mail_view_screen(struct pine *ps) +--- alpine-2.23.orig/alpine/mailpart.c ++++ alpine-2.23/alpine/mailpart.c +@@ -182,7 +182,7 @@ attachment_screen(struct pine *ps) + maxnumwid = 0, maxsizewid = 0, old_cols = -1, km_popped = 0, expbits, + last_type = TYPEOTHER; + long msgno; +- char *q, *last_subtype = NULL, backtag[64], *utf8str; ++ char *q, *last_subtype = NULL, backtag[64], *utf8str, *screen_name; + OtherMenu what; + ATTACH_S *a; + ATDISP_S *current = NULL, *ctmp = NULL; +@@ -191,6 +191,10 @@ attachment_screen(struct pine *ps) + ps->prev_screen = attachment_screen; + ps->next_screen = SCREEN_FUN_NULL; + ++ screen_name = ps->screen_name[0] ? cpystr(ps->screen_name) : NULL; ++ strncpy(ps->screen_name, "attachment", sizeof(ps->screen_name)); ++ ps->screen_name[sizeof(ps->screen_name)-1] = '\0'; ++ + ps->some_quoting_was_suppressed = 0; + + if(ps->ttyo->screen_rows - HEADER_ROWS(ps) - FOOTER_ROWS(ps) < 1){ +@@ -911,6 +915,12 @@ attachment_screen(struct pine *ps) + + if(screen.titlecolor) + free_color_pair(&screen.titlecolor); ++ ++ if(screen_name){ ++ strncpy(ps->screen_name, screen_name, sizeof(ps->screen_name)); ++ ps->screen_name[sizeof(ps->screen_name)-1] = '\0'; ++ fs_give((void **) &screen_name); ++ } + } + + +Index: alpine-2.23/alpine/mailview.c +=================================================================== +--- alpine-2.23.orig/alpine/mailview.c ++++ alpine-2.23/alpine/mailview.c +@@ -252,6 +252,8 @@ mail_view_screen(struct pine *ps) ps->prev_screen = mail_view_screen; ps->force_prefer_plain = ps->force_no_prefer_plain = 0; @@ -345,10 +383,19 @@ Index: alpine-2.22/alpine/mailview.c if(ps->ttyo->screen_rows - HEADER_ROWS(ps) - FOOTER_ROWS(ps) < 1){ q_status_message(SM_ORDER | SM_DING, 0, 3, _("Screen too small to view message")); -Index: alpine-2.22/alpine/osdep/termin.gen.c +@@ -499,6 +501,8 @@ mail_view_screen(struct pine *ps) + } + while(ps->next_screen == SCREEN_FUN_NULL); + ++ strcpy(ps->screen_name, "unknown"); ++ + if (prefix && *prefix) + fs_give((void **)&prefix); + if(we_cancel) +Index: alpine-2.23/alpine/osdep/termin.gen.c =================================================================== ---- alpine-2.22.orig/alpine/osdep/termin.gen.c -+++ alpine-2.22/alpine/osdep/termin.gen.c +--- alpine-2.23.orig/alpine/osdep/termin.gen.c ++++ alpine-2.23/alpine/osdep/termin.gen.c @@ -33,6 +33,8 @@ static char rcsid[] = "$Id: termin.gen.c #include "../../pith/newmail.h" #include "../../pith/conf.h" @@ -418,10 +465,10 @@ Index: alpine-2.22/alpine/osdep/termin.gen.c } return(ret); -Index: alpine-2.22/alpine/reply.c +Index: alpine-2.23/alpine/reply.c =================================================================== ---- alpine-2.22.orig/alpine/reply.c -+++ alpine-2.22/alpine/reply.c +--- alpine-2.23.orig/alpine/reply.c ++++ alpine-2.23/alpine/reply.c @@ -62,7 +62,8 @@ The evolution continues... #include "../pith/tempfile.h" #include "../pith/busy.h" @@ -586,10 +633,10 @@ Index: alpine-2.22/alpine/reply.c pine_send(outgoing, &body, "FORWARD MESSAGE", role, NULL, &reply, redraft_pos, NULL, NULL, 0); -Index: alpine-2.22/alpine/roleconf.c +Index: alpine-2.23/alpine/roleconf.c =================================================================== ---- alpine-2.22.orig/alpine/roleconf.c -+++ alpine-2.22/alpine/roleconf.c +--- alpine-2.23.orig/alpine/roleconf.c ++++ alpine-2.23/alpine/roleconf.c @@ -7706,6 +7706,11 @@ role_text_tool_inick(struct pine *ps, in if(apval) *apval = (role && role->nick) ? cpystr(role->nick) : NULL; @@ -602,10 +649,10 @@ Index: alpine-2.22/alpine/roleconf.c if((*cl)->value) fs_give((void **)&((*cl)->value)); -Index: alpine-2.22/alpine/send.c +Index: alpine-2.23/alpine/send.c =================================================================== ---- alpine-2.22.orig/alpine/send.c -+++ alpine-2.22/alpine/send.c +--- alpine-2.23.orig/alpine/send.c ++++ alpine-2.23/alpine/send.c @@ -63,7 +63,7 @@ static char rcsid[] = "$Id: send.c 1142 #include "../pith/mimetype.h" #include "../pith/send.h" @@ -657,7 +704,7 @@ Index: alpine-2.22/alpine/send.c /* * The type of storage object allocated below is vitally -@@ -2478,6 +2492,26 @@ pine_send(ENVELOPE *outgoing, struct mai +@@ -2482,6 +2496,26 @@ pine_send(ENVELOPE *outgoing, struct mai removing_trailing_white_space(pf->textbuf); (void)removing_double_quotes(pf->textbuf); build_address(pf->textbuf, &addr, NULL, NULL, NULL); @@ -684,10 +731,10 @@ Index: alpine-2.22/alpine/send.c rfc822_parse_adrlist(pf->addr, addr, ps_global->maildomain); fs_give((void **)&addr); -Index: alpine-2.22/pith/Makefile.am +Index: alpine-2.23/pith/Makefile.am =================================================================== ---- alpine-2.22.orig/pith/Makefile.am -+++ alpine-2.22/pith/Makefile.am +--- alpine-2.23.orig/pith/Makefile.am ++++ alpine-2.23/pith/Makefile.am @@ -26,7 +26,7 @@ libpith_a_SOURCES = ablookup.c abdlc.c a filter.c flag.c folder.c handle.c help.c helpindx.c hist.c icache.c ical.c imap.c init.c \ keyword.c ldap.c list.c mailcap.c mailcmd.c mailindx.c maillist.c mailview.c \ @@ -697,11 +744,11 @@ Index: alpine-2.22/pith/Makefile.am state.c status.c store.c stream.c string.c strlst.c takeaddr.c tempfile.c text.c \ thread.c adjtime.c url.c util.c helptext.c smkeys.c smime.c -Index: alpine-2.22/pith/Makefile.in +Index: alpine-2.23/pith/Makefile.in =================================================================== ---- alpine-2.22.orig/pith/Makefile.in -+++ alpine-2.22/pith/Makefile.in -@@ -134,7 +134,7 @@ am_libpith_a_OBJECTS = ablookup.$(OBJEXT +--- alpine-2.23.orig/pith/Makefile.in ++++ alpine-2.23/pith/Makefile.in +@@ -142,7 +142,7 @@ am_libpith_a_OBJECTS = ablookup.$(OBJEXT mimedesc.$(OBJEXT) mimetype.$(OBJEXT) msgno.$(OBJEXT) \ newmail.$(OBJEXT) news.$(OBJEXT) pattern.$(OBJEXT) \ pipe.$(OBJEXT) readfile.$(OBJEXT) remote.$(OBJEXT) \ @@ -710,7 +757,7 @@ Index: alpine-2.22/pith/Makefile.in search.$(OBJEXT) sequence.$(OBJEXT) send.$(OBJEXT) \ sort.$(OBJEXT) state.$(OBJEXT) status.$(OBJEXT) \ store.$(OBJEXT) stream.$(OBJEXT) string.$(OBJEXT) \ -@@ -438,7 +438,7 @@ libpith_a_SOURCES = ablookup.c abdlc.c a +@@ -441,7 +441,7 @@ libpith_a_SOURCES = ablookup.c abdlc.c a filter.c flag.c folder.c handle.c help.c helpindx.c hist.c icache.c ical.c imap.c init.c \ keyword.c ldap.c list.c mailcap.c mailcmd.c mailindx.c maillist.c mailview.c \ margin.c mimedesc.c mimetype.c msgno.c newmail.c news.c pattern.c pipe.c \ @@ -719,7 +766,7 @@ Index: alpine-2.22/pith/Makefile.in state.c status.c store.c stream.c string.c strlst.c takeaddr.c tempfile.c text.c \ thread.c adjtime.c url.c util.c helptext.c smkeys.c smime.c -@@ -581,6 +581,7 @@ distclean-compile: +@@ -575,6 +575,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ @@ -727,10 +774,10 @@ Index: alpine-2.22/pith/Makefile.in .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -Index: alpine-2.22/pith/adrbklib.c +Index: alpine-2.23/pith/adrbklib.c =================================================================== ---- alpine-2.22.orig/pith/adrbklib.c -+++ alpine-2.22/pith/adrbklib.c +--- alpine-2.23.orig/pith/adrbklib.c ++++ alpine-2.23/pith/adrbklib.c @@ -5138,8 +5138,14 @@ init_addrbooks(OpenStatus want_status, i if(as.cur >= as.how_many_personals) pab->type |= GLOBAL; @@ -748,10 +795,10 @@ Index: alpine-2.22/pith/adrbklib.c /* global address books are forced readonly */ if(pab->type & GLOBAL && pab->access != NoAccess) pab->access = ReadOnly; -Index: alpine-2.22/pith/conf.c +Index: alpine-2.23/pith/conf.c =================================================================== ---- alpine-2.22.orig/pith/conf.c -+++ alpine-2.22/pith/conf.c +--- alpine-2.23.orig/pith/conf.c ++++ alpine-2.23/pith/conf.c @@ -29,6 +29,7 @@ static char rcsid[] = "$Id: conf.c 1266 #include "../pith/remote.h" #include "../pith/keyword.h" @@ -760,7 +807,7 @@ Index: alpine-2.22/pith/conf.c #include "../pith/list.h" #include "../pith/status.h" #include "../pith/ldap.h" -@@ -223,6 +224,36 @@ CONF_TXT_T cf_text_unk_character_set[] = +@@ -225,6 +226,36 @@ CONF_TXT_T cf_text_unk_character_set[] = CONF_TXT_T cf_text_editor[] = "Specifies the program invoked by ^_ in the Composer,\n# or the \"enable-alternate-editor-implicitly\" feature."; @@ -797,7 +844,7 @@ Index: alpine-2.22/pith/conf.c CONF_TXT_T cf_text_speller[] = "Specifies the program invoked by ^T in the Composer."; #ifdef _WINDOWS -@@ -564,6 +595,34 @@ static struct variable variables[] = { +@@ -570,6 +601,34 @@ static struct variable variables[] = { NULL, cf_text_thread_exp_char}, {"threading-lastreply-character", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, "Threading Last Reply Character", cf_text_thread_lastreply_char}, @@ -832,7 +879,7 @@ Index: alpine-2.22/pith/conf.c #ifndef _WINDOWS {"display-character-set", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_disp_char_set}, -@@ -2696,6 +2755,7 @@ init_vars(struct pine *ps, void (*cmds_f +@@ -2718,6 +2777,7 @@ init_vars(struct pine *ps, void (*cmds_f if(cmds_f) (*cmds_f)(ps, VAR_INIT_CMD_LIST); @@ -840,7 +887,7 @@ Index: alpine-2.22/pith/conf.c #ifdef _WINDOWS mswin_set_quit_confirm (F_OFF(F_QUIT_WO_CONFIRM, ps_global)); #endif /* _WINDOWS */ -@@ -3150,6 +3210,8 @@ feature_list(int index) +@@ -3174,6 +3234,8 @@ feature_list(int index) F_FORCE_LOW_SPEED, h_config_force_low_speed, PREF_OS_LWSD, 0}, {"auto-move-read-msgs", "Auto Move Read Messages", F_AUTO_READ_MSGS, h_config_auto_read_msgs, PREF_MISC, 0}, @@ -849,7 +896,7 @@ Index: alpine-2.22/pith/conf.c {"auto-unselect-after-apply", NULL, F_AUTO_UNSELECT, h_config_auto_unselect, PREF_MISC, 0}, {"auto-unzoom-after-apply", NULL, -@@ -7786,6 +7848,34 @@ config_help(int var, int feature) +@@ -7842,6 +7904,34 @@ config_help(int var, int feature) return(h_config_ab_sort_rule); case V_FLD_SORT_RULE : return(h_config_fld_sort_rule); @@ -884,11 +931,11 @@ Index: alpine-2.22/pith/conf.c case V_POST_CHAR_SET : return(h_config_post_char_set); case V_UNK_CHAR_SET : -Index: alpine-2.22/pith/conf.h +Index: alpine-2.23/pith/conf.h =================================================================== ---- alpine-2.22.orig/pith/conf.h -+++ alpine-2.22/pith/conf.h -@@ -151,6 +151,46 @@ +--- alpine-2.23.orig/pith/conf.h ++++ alpine-2.23/pith/conf.h +@@ -157,6 +157,46 @@ #define GLO_AB_SORT_RULE vars[V_AB_SORT_RULE].global_val.p #define VAR_FLD_SORT_RULE vars[V_FLD_SORT_RULE].current_val.p #define GLO_FLD_SORT_RULE vars[V_FLD_SORT_RULE].global_val.p @@ -935,10 +982,10 @@ Index: alpine-2.22/pith/conf.h #ifndef _WINDOWS #define VAR_CHAR_SET vars[V_CHAR_SET].current_val.p #define GLO_CHAR_SET vars[V_CHAR_SET].global_val.p -Index: alpine-2.22/pith/conftype.h +Index: alpine-2.23/pith/conftype.h =================================================================== ---- alpine-2.22.orig/pith/conftype.h -+++ alpine-2.22/pith/conftype.h +--- alpine-2.23.orig/pith/conftype.h ++++ alpine-2.23/pith/conftype.h @@ -71,6 +71,20 @@ typedef enum { V_PERSONAL_NAME = 0 , V_THREAD_MORE_CHAR , V_THREAD_EXP_CHAR @@ -960,7 +1007,7 @@ Index: alpine-2.22/pith/conftype.h #ifndef _WINDOWS , V_CHAR_SET , V_OLD_CHAR_SET -@@ -342,6 +356,7 @@ typedef enum { +@@ -348,6 +362,7 @@ typedef enum { F_FULL_AUTO_EXPUNGE, F_EXPUNGE_MANUALLY, F_AUTO_READ_MSGS, @@ -968,10 +1015,10 @@ Index: alpine-2.22/pith/conftype.h F_AUTO_FCC_ONLY, F_READ_IN_NEWSRC_ORDER, F_SELECT_WO_CONFIRM, -Index: alpine-2.22/pith/detoken.c +Index: alpine-2.23/pith/detoken.c =================================================================== ---- alpine-2.22.orig/pith/detoken.c -+++ alpine-2.22/pith/detoken.c +--- alpine-2.23.orig/pith/detoken.c ++++ alpine-2.23/pith/detoken.c @@ -25,7 +25,7 @@ static char rcsid[] = "$Id: detoken.c 76 #include "../pith/reply.h" #include "../pith/mailindx.h" @@ -1033,10 +1080,10 @@ Index: alpine-2.22/pith/detoken.c repl = get_reply_data(env, role, pt->ctype, subbuf, sizeof(subbuf)-1); -Index: alpine-2.22/pith/indxtype.h +Index: alpine-2.23/pith/indxtype.h =================================================================== ---- alpine-2.22.orig/pith/indxtype.h -+++ alpine-2.22/pith/indxtype.h +--- alpine-2.23.orig/pith/indxtype.h ++++ alpine-2.23/pith/indxtype.h @@ -84,6 +84,11 @@ typedef enum {iNothing, iStatus, iFStatu iCurNews, iArrow, iMailbox, iAddress, iInit, iCursorPos, @@ -1085,10 +1132,10 @@ Index: alpine-2.22/pith/indxtype.h #define DEFAULT_REPLY_INTRO "default" -Index: alpine-2.22/pith/mailcmd.c +Index: alpine-2.23/pith/mailcmd.c =================================================================== ---- alpine-2.22.orig/pith/mailcmd.c -+++ alpine-2.22/pith/mailcmd.c +--- alpine-2.23.orig/pith/mailcmd.c ++++ alpine-2.23/pith/mailcmd.c @@ -39,6 +39,7 @@ static char rcsid[] = "$Id: mailcmd.c 11 #include "../pith/ablookup.h" #include "../pith/search.h" @@ -1593,10 +1640,10 @@ Index: alpine-2.22/pith/mailcmd.c + + } +} -Index: alpine-2.22/pith/mailcmd.h +Index: alpine-2.23/pith/mailcmd.h =================================================================== ---- alpine-2.22.orig/pith/mailcmd.h -+++ alpine-2.22/pith/mailcmd.h +--- alpine-2.23.orig/pith/mailcmd.h ++++ alpine-2.23/pith/mailcmd.h @@ -42,6 +42,8 @@ #define DB_FROMTAB 0x02 /* opening because of TAB command */ #define DB_INBOXWOCNTXT 0x04 /* interpret inbox as one true inbox */ @@ -1620,10 +1667,10 @@ Index: alpine-2.22/pith/mailcmd.h void cross_delete_crossposts(MAILSTREAM *); long zoom_index(struct pine *, MAILSTREAM *, MSGNO_S *, int); int unzoom_index(struct pine *, MAILSTREAM *, MSGNO_S *); -Index: alpine-2.22/pith/mailindx.c +Index: alpine-2.23/pith/mailindx.c =================================================================== ---- alpine-2.22.orig/pith/mailindx.c -+++ alpine-2.22/pith/mailindx.c +--- alpine-2.23.orig/pith/mailindx.c ++++ alpine-2.23/pith/mailindx.c @@ -41,6 +41,7 @@ static char rcsid[] = "$Id: mailindx.c 1 #include "../pith/send.h" #include "../pith/options.h" @@ -1646,6 +1693,24 @@ Index: alpine-2.22/pith/mailindx.c if(ps_global->mail_stream && nonempty_patterns(rflags, &pstate)){ for(pat = first_pattern(&pstate); pat; pat = next_pattern(&pstate)){ +@@ -452,7 +460,7 @@ free_hdrtok(HEADER_TOK_S **hdrtok) + static INDEX_PARSE_T itokens[] = { + {"STATUS", iStatus, FOR_INDEX}, + {"MSGNO", iMessNo, FOR_INDEX}, +- {"DATE", iDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE}, ++ {"DATE", iDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE}, + {"FROMORTO", iFromTo, FOR_INDEX}, + {"FROMORTONOTNEWS", iFromToNotNews, FOR_INDEX}, + {"SIZE", iSize, FOR_INDEX}, +@@ -460,7 +468,7 @@ static INDEX_PARSE_T itokens[] = { + {"SIZETHREAD", iSizeThread, FOR_INDEX}, + {"SIZENARROW", iSizeNarrow, FOR_INDEX}, + {"KSIZE", iKSize, FOR_INDEX}, +- {"SUBJECT", iSubject, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE}, ++ {"SUBJECT", iSubject, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE|FOR_RULE|FOR_SAVE|FOR_TRIM}, + {"SHORTSUBJECT", iShortSubject, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE}, + {"FULLSTATUS", iFStatus, FOR_INDEX}, + {"IMAPSTATUS", iIStatus, FOR_INDEX}, @@ -472,56 +480,60 @@ static INDEX_PARSE_T itokens[] = { {"SUBJECTTEXT", iSubjectText, FOR_INDEX}, {"SUBJKEYTEXT", iSubjKeyText, FOR_INDEX}, @@ -1933,7 +1998,7 @@ Index: alpine-2.22/pith/mailindx.c if(shorten) shorten_subject(origsubj); -@@ -5958,6 +6021,9 @@ subj_str(INDEXDATA_S *idata, char *str, +@@ -5956,6 +6019,9 @@ subj_str(INDEXDATA_S *idata, char *str, if(free_subj) fs_give((void **) &free_subj); @@ -1943,7 +2008,7 @@ Index: alpine-2.22/pith/mailindx.c } -@@ -6323,16 +6389,33 @@ from_str(IndexColType ctype, INDEXDATA_S +@@ -6321,16 +6387,33 @@ from_str(IndexColType ctype, INDEXDATA_S ? "To" : (addr = fetch_cc(idata)) ? "Cc" @@ -1983,7 +2048,7 @@ Index: alpine-2.22/pith/mailindx.c break; } -@@ -6345,7 +6428,15 @@ from_str(IndexColType ctype, INDEXDATA_S +@@ -6343,7 +6426,15 @@ from_str(IndexColType ctype, INDEXDATA_S break; case iFrom: @@ -2000,7 +2065,7 @@ Index: alpine-2.22/pith/mailindx.c break; case iAddress: -@@ -6643,3 +6734,64 @@ set_print_format(IELEM_S *ielem, int wid +@@ -6641,3 +6732,64 @@ set_print_format(IELEM_S *ielem, int wid } } } @@ -2065,10 +2130,10 @@ Index: alpine-2.22/pith/mailindx.c + } + return rule_result; +} -Index: alpine-2.22/pith/mailindx.h +Index: alpine-2.23/pith/mailindx.h =================================================================== ---- alpine-2.22.orig/pith/mailindx.h -+++ alpine-2.22/pith/mailindx.h +--- alpine-2.23.orig/pith/mailindx.h ++++ alpine-2.23/pith/mailindx.h @@ -30,6 +30,9 @@ extern void (*setup_header_widths)(MAIL @@ -2079,10 +2144,10 @@ Index: alpine-2.22/pith/mailindx.h int msgline_hidden(MAILSTREAM *, MSGNO_S *, long, int); void adjust_cur_to_visible(MAILSTREAM *, MSGNO_S *); unsigned long line_hash(char *); -Index: alpine-2.22/pith/makefile.wnt +Index: alpine-2.23/pith/makefile.wnt =================================================================== ---- alpine-2.22.orig/pith/makefile.wnt -+++ alpine-2.22/pith/makefile.wnt +--- alpine-2.23.orig/pith/makefile.wnt ++++ alpine-2.23/pith/makefile.wnt @@ -46,7 +46,8 @@ HFILES= ../include/system.h ../include/g init.h keyword.h ldap.h list.h mailcap.h mailcmd.h mailindx.h maillist.h \ mailpart.h mailview.h margin.h mimedesc.h mimetype.h msgno.h newmail.h news.h \ @@ -2102,11 +2167,11 @@ Index: alpine-2.22/pith/makefile.wnt smime.obj smkeys.obj sort.obj state.obj status.obj store.obj stream.obj string.obj strlst.obj \ takeaddr.obj tempfile.obj text.obj thread.obj adjtime.obj url.obj util.obj -Index: alpine-2.22/pith/pine.hlp +Index: alpine-2.23/pith/pine.hlp =================================================================== ---- alpine-2.22.orig/pith/pine.hlp -+++ alpine-2.22/pith/pine.hlp -@@ -4228,6 +4228,7 @@ There are also additional details on +--- alpine-2.23.orig/pith/pine.hlp ++++ alpine-2.23/pith/pine.hlp +@@ -4310,6 +4310,7 @@ There are also additional details on

  • FEATURE:
  • FEATURE:
  • FEATURE: @@ -2114,7 +2179,7 @@ Index: alpine-2.22/pith/pine.hlp
  • FEATURE:
  • FEATURE:
  • FEATURE: -@@ -19682,6 +19683,7 @@ This set of special tokens may be used i +@@ -19760,6 +19761,7 @@ This set of special tokens may be used i "" option, in the "" option, in signature files, @@ -2122,7 +2187,7 @@ Index: alpine-2.22/pith/pine.hlp in template files used in "roles", and in the folder name that is the target of a Filter Rule. -@@ -19694,7 +19696,7 @@ and in the target of Filter Rules. +@@ -19772,7 +19774,7 @@ and in the target of Filter Rules.

    @@ -2131,7 +2196,7 @@ Index: alpine-2.22/pith/pine.hlp

    SUBJECT
    -@@ -19728,6 +19730,22 @@ email address, never the personal name. +@@ -19806,6 +19808,22 @@ email address, never the personal name. For example, "mailbox@domain".
    • @@ -2154,7 +2219,7 @@ Index: alpine-2.22/pith/pine.hlp
    MAILBOX
    This is the same as the "ADDRESS" except that the -@@ -19775,6 +19793,15 @@ are unavailable) of the persons specifie +@@ -19853,6 +19871,15 @@ are unavailable) of the persons specifie message's "Cc:" header field.
    @@ -2170,7 +2235,7 @@ Index: alpine-2.22/pith/pine.hlp
    RECIPS
    This token represents the personal names (or email addresses if the names -@@ -19783,6 +19810,14 @@ message's "To:" header field a +@@ -19861,6 +19888,14 @@ message's "To:" header field a the message's "Cc:" header field.
    @@ -2185,7 +2250,7 @@ Index: alpine-2.22/pith/pine.hlp
    NEWSANDRECIPS
    This token represents the newsgroups from the -@@ -20915,6 +20950,110 @@ This is an end of line marker. +@@ -20993,6 +21028,110 @@ This is an end of line marker.

    @@ -2296,7 +2361,7 @@ Index: alpine-2.22/pith/pine.hlp

    Token Available Only for Templates and Signatures

    -@@ -24273,6 +24412,922 @@ character sets Alpine knows about by usi +@@ -24390,6 +24529,922 @@ character sets Alpine knows about by usi <End of help on this topic> @@ -2517,15 +2582,15 @@ Index: alpine-2.22/pith/pine.hlp +follows. + +

    First you must decide in which screen the macro will be used. This -+feature is currently only available for the screen where your messages -+are listed in index form (MESSAGE INDEX), -+the screen where your message is displayed -+(MESSAGE TEXT) and the screen where the list of -+folders is displayed (FOLDER LIST). The -+internal names of these screens for this patch are "index", -+"text" and -+"folder" respectively. Please note that the internal names are -+all in lowercase and are case sensitive. ++feature is currently only available for the screen where your messages are ++listed in index form (MESSAGE INDEX), the ++screen where your message is displayed (MESSAGE ++TEXT) the screen where the list of folders is displayed (FOLDER LIST) and the attachment index screen (ATTACHMENT INDEX). The internal names of ++these screens for this patch are "index", "text", ++"folder", and "attachment", respectively. Please note ++that the internal names are all in lowercase and are case sensitive. + +

    In order to define the screen, you use the _SCREEN_ token, so for +example, you can write _SCREEN_ == {index}. @@ -3219,7 +3284,7 @@ Index: alpine-2.22/pith/pine.hlp ====== h_config_char_set ===== -@@ -27975,6 +29030,76 @@ the From field is used to show the relat +@@ -28142,6 +29197,76 @@ the From field is used to show the relat <End of help on this topic> @@ -3296,7 +3361,7 @@ Index: alpine-2.22/pith/pine.hlp ====== h_config_pruning_rule ===== -@@ -31624,6 +32749,29 @@ automatically transfer all read messages +@@ -31833,6 +32958,29 @@ automatically transfer all read messages them as deleted in the INBOX. Messages in the INBOX marked with an "N" (meaning New, or unseen) are not affected.

    @@ -3326,10 +3391,10 @@ Index: alpine-2.22/pith/pine.hlp

    -Index: alpine-2.22/pith/reply.c +Index: alpine-2.23/pith/reply.c =================================================================== ---- alpine-2.22.orig/pith/reply.c -+++ alpine-2.22/pith/reply.c +--- alpine-2.23.orig/pith/reply.c ++++ alpine-2.23/pith/reply.c @@ -47,6 +47,8 @@ static char rcsid[] = "$Id: reply.c 1074 #include "../pith/mailcmd.h" #include "../pith/margin.h" @@ -3402,7 +3467,7 @@ Index: alpine-2.22/pith/reply.c } -@@ -1485,6 +1525,10 @@ get_addr_data(ENVELOPE *env, IndexColTyp +@@ -1486,6 +1526,10 @@ get_addr_data(ENVELOPE *env, IndexColTyp buf[0] = '\0'; switch(type){ @@ -3413,7 +3478,7 @@ Index: alpine-2.22/pith/reply.c case iFrom: addr = env ? env->from : NULL; break; -@@ -1897,22 +1941,194 @@ get_reply_data(ENVELOPE *env, ACTION_S * +@@ -1898,22 +1942,194 @@ get_reply_data(ENVELOPE *env, ACTION_S * break; @@ -3612,7 +3677,7 @@ Index: alpine-2.22/pith/reply.c case iNewLine: if(maxlen >= strlen(NEWLINE)){ strncpy(buf, NEWLINE, maxlen); -@@ -1940,6 +2156,11 @@ get_reply_data(ENVELOPE *env, ACTION_S * +@@ -1941,6 +2157,11 @@ get_reply_data(ENVELOPE *env, ACTION_S * break; @@ -3624,7 +3689,7 @@ Index: alpine-2.22/pith/reply.c case iNews: case iCurNews: get_news_data(env, type, buf, maxlen); -@@ -1989,6 +2210,14 @@ get_reply_data(ENVELOPE *env, ACTION_S * +@@ -1990,6 +2211,14 @@ get_reply_data(ENVELOPE *env, ACTION_S * break; @@ -3639,7 +3704,7 @@ Index: alpine-2.22/pith/reply.c case iSubject: case iShortSubject: if(env && env->subject){ -@@ -2051,7 +2280,18 @@ reply_delimiter(ENVELOPE *env, ACTION_S +@@ -2052,7 +2281,18 @@ reply_delimiter(ENVELOPE *env, ACTION_S if(!env) return; @@ -3659,7 +3724,7 @@ Index: alpine-2.22/pith/reply.c buf[MAX_DELIM] = '\0'; /* preserve exact default behavior from before */ if(!strcmp(buf, DEFAULT_REPLY_INTRO)){ -@@ -2310,6 +2550,7 @@ forward_subject(ENVELOPE *env, int flags +@@ -2311,6 +2551,7 @@ forward_subject(ENVELOPE *env, int flags { size_t l; char *p, buftmp[MAILTMPLEN]; @@ -3667,7 +3732,7 @@ Index: alpine-2.22/pith/reply.c if(!env) return(NULL); -@@ -2317,9 +2558,19 @@ forward_subject(ENVELOPE *env, int flags +@@ -2318,9 +2559,19 @@ forward_subject(ENVELOPE *env, int flags dprint((9, "checking subject: \"%s\"\n", env->subject ? env->subject : "NULL")); @@ -3690,10 +3755,10 @@ Index: alpine-2.22/pith/reply.c /* decode any 8bit (copy to the temp buffer if decoding doesn't) */ if(rfc1522_decode_to_utf8((unsigned char *) tmp_20k_buf, SIZEOF_20KBUF, buftmp) == (unsigned char *) buftmp) -Index: alpine-2.22/pith/rules.c +Index: alpine-2.23/pith/rules.c =================================================================== --- /dev/null -+++ alpine-2.22/pith/rules.c ++++ alpine-2.23/pith/rules.c @@ -0,0 +1,1565 @@ +/* This module was written by + * @@ -4284,7 +4349,7 @@ Index: alpine-2.22/pith/rules.c + || (i == 0 && d[1] != 'A' && d[1] != 'O' && d[1] != '\0')) + error++; + break; -+ case ')': if(i == 0 || d[i+1] != '\0' && (d[i+1] == 'C' || d[i+1] == '(')) ++ case ')': if(i == 0 || (d[i+1] != '\0' && (d[i+1] == 'C' || d[i+1] == '('))) + error++; + break; + case '(': if(d[i+1] == '\0' || d[i+1] == ')' || d[i+1] == 'A' || d[i+1] == 'O') @@ -4846,7 +4911,7 @@ Index: alpine-2.22/pith/rules.c + break; + case Or : return rv ? 1 : test_condition_work(bc->next->next, ec, rcntxt, env); + break; -+ case ')': return rv; ++ case ParClose: return rv; + default : rv = 0; break; /* fail, we should not be here */ + } + break; @@ -5260,10 +5325,10 @@ Index: alpine-2.22/pith/rules.c + env = pine_mail_fetchenvelope(idata->stream, idata->rawno); + return env; +} -Index: alpine-2.22/pith/rules.h +Index: alpine-2.23/pith/rules.h =================================================================== --- /dev/null -+++ alpine-2.22/pith/rules.h ++++ alpine-2.23/pith/rules.h @@ -0,0 +1,154 @@ +/* Included file rules.h */ + @@ -5419,10 +5484,10 @@ Index: alpine-2.22/pith/rules.h +#define RELAXED 0x2 + +#endif /* PITH_RULES_INCLUDED */ -Index: alpine-2.22/pith/rulestype.h +Index: alpine-2.23/pith/rulestype.h =================================================================== --- /dev/null -+++ alpine-2.22/pith/rulestype.h ++++ alpine-2.23/pith/rulestype.h @@ -0,0 +1,94 @@ +#ifndef PITH_RULESTYPE_INCLUDED +#define PITH_RULESTYPE_INCLUDED @@ -5518,10 +5583,10 @@ Index: alpine-2.22/pith/rulestype.h + + +#endif /* PITH_RULESTYPE_INCLUDED */ -Index: alpine-2.22/pith/save.c +Index: alpine-2.23/pith/save.c =================================================================== ---- alpine-2.22.orig/pith/save.c -+++ alpine-2.22/pith/save.c +--- alpine-2.23.orig/pith/save.c ++++ alpine-2.23/pith/save.c @@ -954,7 +954,7 @@ save(struct pine *state, MAILSTREAM *str *date = '\0'; @@ -5531,10 +5596,10 @@ Index: alpine-2.22/pith/save.c mc ? mc->rfc822_size : 0L, flags, date, so); if(flags) -Index: alpine-2.22/pith/send.c +Index: alpine-2.23/pith/send.c =================================================================== ---- alpine-2.22.orig/pith/send.c -+++ alpine-2.22/pith/send.c +--- alpine-2.23.orig/pith/send.c ++++ alpine-2.23/pith/send.c @@ -44,6 +44,7 @@ static char rcsid[] = "$Id: send.c 1204 #include "../pith/ablookup.h" #include "../pith/sort.h" @@ -5617,10 +5682,10 @@ Index: alpine-2.22/pith/send.c } else if((postcmd = smtp_command(ps_global->c_client_error, sizeof(ps_global->c_client_error))) != NULL){ char *cmdlist[2]; -Index: alpine-2.22/pith/sort.c +Index: alpine-2.23/pith/sort.c =================================================================== ---- alpine-2.22.orig/pith/sort.c -+++ alpine-2.22/pith/sort.c +--- alpine-2.23.orig/pith/sort.c ++++ alpine-2.23/pith/sort.c @@ -30,7 +30,7 @@ static char rcsid[] = "$Id: sort.c 1142 #include "../pith/signal.h" #include "../pith/busy.h" @@ -5630,39 +5695,10 @@ Index: alpine-2.22/pith/sort.c /* * global place to store mail_sort and mail_thread results -@@ -695,7 +695,21 @@ reset_sort_order(unsigned int flags) - PAT_S *pat; - SortOrder the_sort_order; - int sort_is_rev; -- -+ char *rule_result; -+ SortOrder new_sort = EndofList; -+ int is_rev; -+ -+ rule_result = get_rule_result(FOR_SORT, ps_global->cur_folder, V_SORT_RULES); -+ if (rule_result && *rule_result){ -+ new_sort = (SortOrder) translate(rule_result, 1); -+ is_rev = (SortOrder) translate(rule_result, 0) == EndofList ? 0 : 1; -+ fs_give((void **)&rule_result); -+ } -+ if (new_sort != EndofList){ -+ the_sort_order = new_sort; -+ sort_is_rev = is_rev; -+ } -+ else{ - /* set default order */ - the_sort_order = ps_global->def_sort; - sort_is_rev = the_sort_order == SortThread -@@ -721,7 +735,43 @@ reset_sort_order(unsigned int flags) - - if(the_sort_order == SortThread && !(flags & SRT_MAN)) - ps_global->thread_cur_sort = ps_global->thread_def_sort; -- -+} - sort_folder(ps_global->mail_stream, ps_global->msgmap, - the_sort_order, sort_is_rev, flags, 1); +@@ -686,6 +686,41 @@ pine_compare_scores(const qsort_t *a, co + : ((mdiff = *mess_a - *mess_b) ? ((mdiff > 0) ? 1 : -1) : 0)); } -+ + +SortOrder translate(char *order, int is_rev) +{ + int rev = 0; @@ -5698,10 +5734,44 @@ Index: alpine-2.22/pith/sort.c + return is_rev || rev ? SortScore : EndofList; + return EndofList; +} -Index: alpine-2.22/pith/sort.h + + void + reset_sort_order(unsigned int flags) +@@ -695,7 +730,21 @@ reset_sort_order(unsigned int flags) + PAT_S *pat; + SortOrder the_sort_order; + int sort_is_rev; +- ++ char *rule_result; ++ SortOrder new_sort = EndofList; ++ int is_rev; ++ ++ rule_result = get_rule_result(FOR_SORT, ps_global->cur_folder, V_SORT_RULES); ++ if (rule_result && *rule_result){ ++ new_sort = (SortOrder) translate(rule_result, 1); ++ is_rev = (SortOrder) translate(rule_result, 0) == EndofList ? 0 : 1; ++ fs_give((void **)&rule_result); ++ } ++ if (new_sort != EndofList){ ++ the_sort_order = new_sort; ++ sort_is_rev = is_rev; ++ } ++ else{ + /* set default order */ + the_sort_order = ps_global->def_sort; + sort_is_rev = the_sort_order == SortThread +@@ -721,6 +770,7 @@ reset_sort_order(unsigned int flags) + + if(the_sort_order == SortThread && !(flags & SRT_MAN)) + ps_global->thread_cur_sort = ps_global->thread_def_sort; ++ } + + sort_folder(ps_global->mail_stream, ps_global->msgmap, + the_sort_order, sort_is_rev, flags, 1); +Index: alpine-2.23/pith/sort.h =================================================================== ---- alpine-2.22.orig/pith/sort.h -+++ alpine-2.22/pith/sort.h +--- alpine-2.23.orig/pith/sort.h ++++ alpine-2.23/pith/sort.h @@ -45,6 +45,6 @@ char *sort_name(SortOrder); void sort_folder(MAILSTREAM *, MSGNO_S *, SortOrder, int, unsigned, int); int decode_sort(char *, SortOrder *, int *, int); @@ -5710,10 +5780,10 @@ Index: alpine-2.22/pith/sort.h +SortOrder translate(char *, int); #endif /* PITH_SORT_INCLUDED */ -Index: alpine-2.22/pith/state.c +Index: alpine-2.23/pith/state.c =================================================================== ---- alpine-2.22.orig/pith/state.c -+++ alpine-2.22/pith/state.c +--- alpine-2.23.orig/pith/state.c ++++ alpine-2.23/pith/state.c @@ -35,6 +35,7 @@ static char rcsid[] = "$Id: state.c 1074 #include "../pith/smime.h" #include "../pith/ical.h" @@ -5722,7 +5792,7 @@ Index: alpine-2.22/pith/state.c /* * Globals referenced throughout pine... -@@ -249,6 +250,9 @@ free_pine_struct(struct pine **pps) +@@ -255,6 +256,9 @@ free_pine_struct(struct pine **pps) if((*pps)->msgmap) msgno_give(&(*pps)->msgmap); @@ -5732,10 +5802,10 @@ Index: alpine-2.22/pith/state.c free_vars(*pps); fs_give((void **) pps); -Index: alpine-2.22/pith/state.h +Index: alpine-2.23/pith/state.h =================================================================== ---- alpine-2.22.orig/pith/state.h -+++ alpine-2.22/pith/state.h +--- alpine-2.23.orig/pith/state.h ++++ alpine-2.23/pith/state.h @@ -33,7 +33,7 @@ #include "../pith/stream.h" #include "../pith/color.h" @@ -5745,11 +5815,11 @@ Index: alpine-2.22/pith/state.h /* * Printing control structure -@@ -105,6 +105,11 @@ struct pine { +@@ -112,6 +112,11 @@ struct pine { MAILSTREAM *mail_stream; /* ptr to current folder stream */ MSGNO_S *msgmap; /* ptr to current message map */ -+ char screen_name[10]; /* name of current screen */ ++ char screen_name[16]; /* name of current screen */ + char *role; /* role used when composing */ + char *procid; /* procedure id when needed */ + int exiting; @@ -5757,7 +5827,7 @@ Index: alpine-2.22/pith/state.h unsigned read_predicted:1; char cur_folder[MAXPATH+1]; -@@ -360,6 +365,7 @@ struct pine { +@@ -367,6 +372,7 @@ struct pine { struct { char *(*display_filter)(char *, STORE_S *, gf_io_t, FILTLIST_S *); char *(*display_filter_trigger)(BODY *, char *, size_t); @@ -5765,7 +5835,7 @@ Index: alpine-2.22/pith/state.h } tools; KEYWORD_S *keywords; -@@ -370,6 +376,9 @@ struct pine { +@@ -377,6 +383,9 @@ struct pine { char last_error[500]; INIT_ERR_S *init_errs; @@ -5775,10 +5845,10 @@ Index: alpine-2.22/pith/state.h PRINT_S *print; #ifdef SMIME -Index: alpine-2.22/pith/string.c +Index: alpine-2.23/pith/string.c =================================================================== ---- alpine-2.22.orig/pith/string.c -+++ alpine-2.22/pith/string.c +--- alpine-2.23.orig/pith/string.c ++++ alpine-2.23/pith/string.c @@ -20,6 +20,7 @@ static char rcsid[] = "$Id: string.c 910 string.c Misc extra and useful string functions @@ -5855,10 +5925,10 @@ Index: alpine-2.22/pith/string.c + } +} + -Index: alpine-2.22/pith/string.h +Index: alpine-2.23/pith/string.h =================================================================== ---- alpine-2.22.orig/pith/string.h -+++ alpine-2.22/pith/string.h +--- alpine-2.23.orig/pith/string.h ++++ alpine-2.23/pith/string.h @@ -87,6 +87,7 @@ struct date { /* exported prototypes */ diff --git a/extern.diff b/extern.diff deleted file mode 100644 index dbfb7a6..0000000 --- a/extern.diff +++ /dev/null @@ -1,22 +0,0 @@ -From: Jan Engelhardt -Date: 2020-06-07 12:47:25.957623338 +0200 - -Can't define a symbol twice. (smime.c being the other place.) - ---- - pith/smkeys.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: alpine-2.22/pith/smkeys.c -=================================================================== ---- alpine-2.22.orig/pith/smkeys.c -+++ alpine-2.22/pith/smkeys.c -@@ -50,7 +50,7 @@ static int mem_add_extra_cacerts(c - int compare_certs_by_name(const void *data1, const void *data2); - int password_policy_check(char *); - --int (*pith_smime_enter_password)(char *, char *, size_t); -+extern int (*pith_smime_enter_password)(char *, char *, size_t); - - /* test if password passes a predetermined policy. - * return value: 0 - does not pass; 1 - it passes diff --git a/pico-fix-spurious-undef-warnings.diff b/pico-fix-spurious-undef-warnings.diff index 5162580..e3ca9eb 100644 --- a/pico-fix-spurious-undef-warnings.diff +++ b/pico-fix-spurious-undef-warnings.diff @@ -5,11 +5,11 @@ pico/osdep/shell.c | 3 +-- 4 files changed, 25 insertions(+), 2 deletions(-) -Index: alpine-2.22/imap/src/c-client/mail.h +Index: alpine-2.23/imap/src/c-client/mail.h =================================================================== ---- alpine-2.22.orig/imap/src/c-client/mail.h -+++ alpine-2.22/imap/src/c-client/mail.h -@@ -1914,6 +1914,14 @@ long INWAIT (long seconds); +--- alpine-2.23.orig/imap/src/c-client/mail.h ++++ alpine-2.23/imap/src/c-client/mail.h +@@ -1921,6 +1921,14 @@ long INWAIT (long seconds); int PSOUT (char *s); int PSOUTR (SIZEDTEXT *s); int PFLUSH (void); @@ -22,12 +22,12 @@ Index: alpine-2.22/imap/src/c-client/mail.h +#define if(x) if((x)) +#define while(x) while((x)) - /* XOAUTH Client-Side Support */ + /* XOAUTH2 and AUTHBEARER Client-Side Support */ -Index: alpine-2.22/imap/src/osdep/unix/os_slx.h +Index: alpine-2.23/imap/src/osdep/unix/os_slx.h =================================================================== ---- alpine-2.22.orig/imap/src/osdep/unix/os_slx.h -+++ alpine-2.22/imap/src/osdep/unix/os_slx.h +--- alpine-2.23.orig/imap/src/osdep/unix/os_slx.h ++++ alpine-2.23/imap/src/osdep/unix/os_slx.h @@ -69,3 +69,11 @@ int portable_utime (char *file,time_t ti #include "ftl.h" #include "nl.h" @@ -40,10 +40,10 @@ Index: alpine-2.22/imap/src/osdep/unix/os_slx.h + */ +#define if(x) if((x)) +#define while(x) while((x)) -Index: alpine-2.22/include/system.h +Index: alpine-2.23/include/system.h =================================================================== ---- alpine-2.22.orig/include/system.h -+++ alpine-2.22/include/system.h +--- alpine-2.23.orig/include/system.h ++++ alpine-2.23/include/system.h @@ -389,4 +389,12 @@ typedef int gid_t; # define LOCAL_PASSWD_CACHE #endif @@ -57,10 +57,10 @@ Index: alpine-2.22/include/system.h +#define if(x) if((x)) +#define while(x) while((x)) #endif /* _SYSTEM_INCLUDED */ -Index: alpine-2.22/pico/osdep/shell.c +Index: alpine-2.23/pico/osdep/shell.c =================================================================== ---- alpine-2.22.orig/pico/osdep/shell.c -+++ alpine-2.22/pico/osdep/shell.c +--- alpine-2.23.orig/pico/osdep/shell.c ++++ alpine-2.23/pico/osdep/shell.c @@ -98,7 +98,6 @@ bktoshell(int f, int n) if(gmode&MDSPWN){