merge: timeout

 * add ident to PATCHES
 * feature: timeout

diff --cc PATCHES
index 5bfa313b7649187f71c18288d1df80fb70050aad,302c9b54fe1ad1dc92755718de9c3489c1889acc..675387e2dcd34a9879da7e5a4a6783b95e921e60
--- 1/PATCHES
--- 2/PATCHES
+++ b/PATCHES
@@@ -1,21 -1,1 +1,22 @@@
 +patch-compress-neomutt
 +patch-cond-date-neomutt
 +patch-fmemopen-neomutt
 +patch-ifdef-neomutt
 +patch-index-color-neomutt
 +patch-initials-neomutt
 +patch-keywords-neomutt
 +patch-limit-current-thread-neomutt
 +patch-lmdb-neomutt
 +patch-multiple-fcc-neomutt
 +patch-nested-if-neomutt
 +patch-new-mail-neomutt
 +patch-nntp-neomutt
 +patch-notmuch-neomutt
 +patch-progress-neomutt
 +patch-quasi-delete-neomutt
 +patch-sidebar-neomutt
 +patch-skip-quoted-neomutt
 +patch-smime-encrypt-self-neomutt
 +patch-status-color-neomutt
+ patch-timeout-neomutt
 +patch-tls-sni-neomutt

diff --cc curs_main.c
Simple merge

diff --cc hook.c
Simple merge

diff --cc init.h
Simple merge

diff --cc mutt.h
index df47189527c2a87390a04f65a0aaca6d9c374564,c97ab3caf6331398b274effbe7ae09acbb4b80bb..e7ecdffdddbad3685d1c862c502d524b77277b36
--- 1/mutt.h
--- 2/mutt.h
+++ b/mutt.h
@@@ -159,11 -141,7 +159,12 @@@ typedef enu
  #define MUTT_ACCOUNTHOOK (1<<9)
  #define MUTT_REPLYHOOK   (1<<10)
  #define MUTT_SEND2HOOK   (1<<11)
 -#define MUTT_TIMEOUTHOOK (1<<12)
 +#ifdef USE_COMPRESSED
 +#define MUTT_OPENHOOK    (1<<12)
 +#define MUTT_APPENDHOOK  (1<<13)
 +#define MUTT_CLOSEHOOK   (1<<14)
 +#endif
++#define MUTT_TIMEOUTHOOK (1<<15)
  
  /* tree characters for linearize_tree and print_enriched_string */
  #define MUTT_TREE_LLCORNER      1

diff --cc protos.h
Simple merge