- vvv.nttp patch updated to 1.11.1

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

diff --git a/mutt-bj.status-time.patch b/mutt-bj.status-time.patch
index 690c51a38c20672a80eb7b538431f62541725d43..0d4dccb228149510e32706bdaf8efd9eb3ba19aa 100644 (file)
--- a/mutt-bj.status-time.patch
+++ b/mutt-bj.status-time.patch
@@ -1,15 +1,15 @@
 diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/curs_main.c mutt-1.5.10/curs_main.c
---- mutt-1.5.10.orig/curs_main.c       2005-10-07 09:28:10.000000000 +0200
-+++ mutt-1.5.10/curs_main.c    2005-10-07 09:28:24.000000000 +0200
-@@ -559,7 +559,7 @@
-         menu_redraw_current (menu);
-       }
+--- 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) || update_status_time ())
-       {
-       menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
-       CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2);
+-  if (menu->redraw & REDRAW_STATUS)
++  if (menu->redraw & REDRAW_STATUS || update_status_time ())
+   {
+     menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
+     mutt_window_move (MuttStatusWindow, 0, 0);
 --- 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 @@
@@ -23,16 +23,15 @@ diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/curs_main.c mutt-1.5.10/curs_main
 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 @@
+@@ -2626,6 +2626,8 @@
    ** .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
+   ** .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.
@@ -90,42 +89,30 @@ 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);
      }
+   }
  
--    if ((redraw & REDRAW_INDEX) && index)
-+    if (index && ((redraw & REDRAW_INDEX) || update_status_time ()))
-     {
-       /* redraw the pager_index indicator, because the
-        * flags for this message might have changed. */
+-  if ((pager_menu->redraw & REDRAW_INDEX) && rd->index)
++  if (( (pager_menu->redraw & REDRAW_INDEX) || update_status_time()) && rd->index)
+   {
+     /* redraw the pager_index indicator, because the
+      * flags for this message might have changed. */
 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>
-+#include <locale.h>
- 
- static char *get_sort_str (char *buf, size_t buflen, int method)
- {
-@@ -288,6 +289,61 @@
+@@ -303,6 +304,47 @@
        *buf = 0;
        return (src);
  
 +    case '[':
 +      {
-+      int do_locales;
 +      int len = sizeof (fmt) - 1;
 +
 +      cp = fmt;
 +      if (*src == '!')
 +      {
-+        do_locales = 0;
 +        src++;
 +      }
-+      else
-+        do_locales = 1;
 +
 +      while (len > 0 && *src != ']')
 +      {
@@ -150,18 +137,8 @@ diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/status.c mutt-1.5.10/status.c
 +      }
 +      *cp = 0;
 +      src++;
-+
-+      if (do_locales && Locale)
-+        setlocale (LC_TIME, Locale);
-+
-+      {
-+        time_t now = time (NULL);
-+
-+        strftime (tmp, sizeof (tmp), fmt, localtime (&now));
-+      }
-+
-+      if (do_locales && Locale)
-+        setlocale (LC_TIME, "C");
++      time_t now = time (NULL);
++      strftime (tmp, sizeof (tmp), fmt, localtime (&now));
 +
 +      snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
 +      snprintf (buf, buflen, fmt, tmp);