attempt at fixing imap_fast_trash patch for 1.6.0

[packages/mutt.git] / mutt-bj.status-time.patch

diff --git a/mutt-bj.status-time.patch b/mutt-bj.status-time.patch
index 8556b192e38827f1e1f0f016a8d58d5e3f24ba71..2469ccdd48ad2d775f2df3467b4f5edf93df5986 100644 (file)
--- a/mutt-bj.status-time.patch
+++ b/mutt-bj.status-time.patch
@@ -1,40 +1,39 @@
-diff -Nur mutt-1.3.25-2/curs_main.c mutt-1.3.25/curs_main.c
---- mutt-1.3.25-2/curs_main.c  Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/curs_main.c    Tue Jan 22 00:07:02 2002
-@@ -546,7 +546,7 @@
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/curs_main.c mutt-1.5.10/curs_main.c
+--- mutt-1.5.20.b/curs_main.c  2009-07-14 12:34:25.000000000 +0200
++++ mutt-1.5.20/curs_main.c    2009-07-14 12:42:41.000000000 +0200
+@@ -556,7 +556,7 @@
          menu_redraw_current (menu);
        }
  
--      if (menu->redraw & REDRAW_STATUS) 
+-      if (menu->redraw & REDRAW_STATUS)
 +      if ((menu->redraw & REDRAW_STATUS) || update_status_time ())
        {
        menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
        CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2);
-diff -Nur mutt-1.3.25-2/globals.h mutt-1.3.25/globals.h
---- mutt-1.3.25-2/globals.h    Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/globals.h      Tue Jan 22 00:07:02 2002
-@@ -145,6 +145,7 @@
- WHERE short ReadInc;
+--- mutt-1.5.18/globals.h.orig 2008-01-30 05:26:50.000000000 +0100
++++ mutt-1.5.18/globals.h      2008-07-25 17:41:02.532746787 +0200
+@@ -200,6 +200,7 @@
+ WHERE short SaveHist;
  WHERE short SendmailWait;
  WHERE short SleepTime INITVAL (1);
 +WHERE short StatusUpdate;
+ WHERE short TimeInc;
  WHERE short Timeout;
- WHERE short WrapMargin;
- WHERE short WriteInc;
-diff -Nur mutt-1.3.25-2/init.h mutt-1.3.25/init.h
---- mutt-1.3.25-2/init.h       Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/init.h Tue Jan 22 00:09:07 2002
-@@ -2119,6 +2119,9 @@
+ WHERE short Wrap;
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/init.h mutt-1.5.10/init.h
+--- mutt-1.5.10.orig/init.h    2005-10-07 09:28:10.000000000 +0200
++++ mutt-1.5.10/init.h 2005-10-07 09:28:24.000000000 +0200
+@@ -2626,6 +2626,9 @@
    ** .dt %u  .dd number of unread messages *
    ** .dt %v  .dd Mutt version string
    ** .dt %V  .dd currently active limit pattern, if any *
 +  ** .dt %[fmt] .dd the current date and time. ``fmt'' is
 +  **                expanded by the system call ``strftime'';
 +  **                a leading bang disables locales 
-   ** .dt %>X .dd right justify the rest of the string and pad with "X"
-   ** .dt %|X .dd pad to the end of the line with "X"
-   ** .de
-@@ -2160,6 +2163,16 @@
+   ** .dt %>X .dd right justify the rest of the string and pad with ``X''
+   ** .dt %|X .dd pad to the end of the line with ``X''
+   ** .dt %*X .dd soft-fill with character ``X'' as pad
+@@ -2671,6 +2674,16 @@
    ** Setting this variable causes the ``status bar'' to be displayed on
    ** the first line of the screen rather than near the bottom.
    */
@@ -51,10 +50,10 @@ diff -Nur mutt-1.3.25-2/init.h mutt-1.3.25/init.h
    { "strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, 0 },
    /*
    ** .pp
-diff -Nur mutt-1.3.25-2/menu.c mutt-1.3.25/menu.c
---- mutt-1.3.25-2/menu.c       Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/menu.c Tue Jan 22 00:07:02 2002
-@@ -1045,3 +1045,23 @@
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/menu.c mutt-1.5.10/menu.c
+--- mutt-1.5.10.orig/menu.c    2005-06-12 20:32:46.000000000 +0200
++++ mutt-1.5.10/menu.c 2005-10-07 09:28:24.000000000 +0200
+@@ -1087,3 +1087,23 @@
    }
    /* not reached */
  }
@@ -78,19 +77,19 @@ diff -Nur mutt-1.3.25-2/menu.c mutt-1.3.25/menu.c
 +  else
 +    return 0;
 +}
-diff -Nur mutt-1.3.25-2/mutt_menu.h mutt-1.3.25/mutt_menu.h
---- mutt-1.3.25-2/mutt_menu.h  Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/mutt_menu.h    Tue Jan 22 00:07:02 2002
-@@ -107,3 +107,5 @@
- /* used in both the index and pager index to make an entry. */
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/mutt_menu.h mutt-1.5.10/mutt_menu.h
+--- mutt-1.5.10.orig/mutt_menu.h       2005-08-11 21:37:02.000000000 +0200
++++ mutt-1.5.10/mutt_menu.h    2005-10-07 09:28:59.000000000 +0200
+@@ -112,4 +112,5 @@
  void index_make_entry (char *, size_t, struct menu_t *, int);
  int index_color (int);
-+
+ 
 +int update_status_time (void);
-diff -Nur mutt-1.3.25-2/pager.c mutt-1.3.25/pager.c
---- mutt-1.3.25-2/pager.c      Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/pager.c        Tue Jan 22 00:07:02 2002
-@@ -1712,7 +1712,7 @@
+ #endif /* _MUTT_MENU_H_ */
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/pager.c mutt-1.5.10/pager.c
+--- mutt-1.5.10.orig/pager.c   2005-08-11 21:37:02.000000000 +0200
++++ mutt-1.5.10/pager.c        2005-10-07 09:28:24.000000000 +0200
+@@ -1763,7 +1763,7 @@
        SETCOLOR (MT_COLOR_NORMAL);
      }
  
@@ -99,10 +98,10 @@ diff -Nur mutt-1.3.25-2/pager.c mutt-1.3.25/pager.c
      {
        /* redraw the pager_index indicator, because the
         * flags for this message might have changed. */
-diff -Nur mutt-1.3.25-2/status.c mutt-1.3.25/status.c
---- mutt-1.3.25-2/status.c     Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/status.c       Tue Jan 22 00:07:02 2002
-@@ -26,6 +26,7 @@
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/status.c mutt-1.5.10/status.c
+--- mutt-1.5.10.orig/status.c  2005-10-07 09:28:10.000000000 +0200
++++ mutt-1.5.10/status.c       2005-10-07 09:28:24.000000000 +0200
+@@ -30,6 +30,7 @@
  #include <string.h>
  #include <ctype.h>
  #include <unistd.h>
@@ -110,7 +109,7 @@ diff -Nur mutt-1.3.25-2/status.c mutt-1.3.25/status.c
  
  static char *get_sort_str (char *buf, size_t buflen, int method)
  {
-@@ -284,6 +285,61 @@
+@@ -288,6 +289,61 @@
        *buf = 0;
        return (src);
  
@@ -172,4 +171,3 @@ diff -Nur mutt-1.3.25-2/status.c mutt-1.3.25/status.c
      default:
        snprintf (buf, buflen, "%%%s%c", prefix, op);
        break;
-