- rebuild with libidn 1.35

[packages/mutt.git] / mutt-folder_columns.patch

diff --git a/mutt-folder_columns.patch b/mutt-folder_columns.patch
index 59ffc402c07f891487317f595b06ba6142c23a10..57cbff46e6a6fa8e19280387f1026258390da8c9 100644 (file)
--- a/mutt-folder_columns.patch
+++ b/mutt-folder_columns.patch
@@ -35,7 +35,7 @@
  WHERE short PagerIndexLines;
 --- mutt-1.3.23-orig/browser.c Sun Oct 28 19:35:26 2001
 +++ mutt-1.3.23/browser.c      Tue Oct 30 22:44:18 2001
-@@ -476,12 +476,13 @@
+@@ -492,12 +492,13 @@
  }
  
  static void init_menu (struct browser_state *state, MUTTMENU *menu, char *title,
@@ -51,7 +51,7 @@
    if(menu->current >= menu->max)
      menu->current = menu->max - 1;
    if (menu->current < 0)
-@@ -634,7 +635,7 @@
+@@ -660,7 +661,7 @@
    menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER,
      FolderHelp);
  
@@ -60,7 +60,7 @@
  
    FOREVER
    {
-@@ -765,7 +766,7 @@
+@@ -791,7 +792,7 @@
            }
            menu->current = 0; 
            menu->top = 0; 
@@ -69,7 +69,7 @@
            break;
          }
        }
-@@ -863,7 +864,7 @@
+@@ -890,7 +891,7 @@
          menu->data = state.entry;
          menu->current = 0; 
          menu->top = 0; 
@@ -77,8 +77,8 @@
 +        init_menu (&state, menu, title, sizeof (title), buffy, 1);
          MAYBE_REDRAW (menu->redraw);
        }
-       break;
-@@ -893,7 +894,7 @@
+       /* else leave error on screen */
+@@ -949,7 +950,7 @@
                    sizeof (struct folder_file) * (state.entrylen - (nentry+1)));
              state.entrylen--;
              mutt_message _("Mailbox deleted.");
@@ -87,7 +87,7 @@
              MAYBE_REDRAW (menu->redraw);
            }
          }
-@@ -933,7 +934,7 @@
+@@ -990,7 +991,7 @@
            menu->data = state.entry;
            menu->current = 0; 
            menu->top = 0; 
@@ -96,18 +96,18 @@
          }
          else
  #endif
-@@ -947,7 +948,7 @@
-             {
-               menu->current = 0; 
-               menu->top = 0; 
+@@ -1021,7 +1022,7 @@
+               }
+               menu->current = 0;
+               menu->top = 0;
 -              init_menu (&state, menu, title, sizeof (title), buffy);
 +              init_menu (&state, menu, title, sizeof (title), buffy, 1);
              }
              else
-             {
-@@ -1010,12 +1011,12 @@
-             state.imap_browse = 1;
+               mutt_error (_("%s is not a directory."), buf);
+@@ -1078,12 +1079,12 @@
              imap_browse (LastDir, &state);
+             browser_sort (&state);
              menu->data = state.entry;
 -            init_menu (&state, menu, title, sizeof (title), buffy);
 +            init_menu (&state, menu, title, sizeof (title), buffy, 1);
@@ -120,7 +120,7 @@
            else
            {
              mutt_error _("Error scanning directory.");
-@@ -1099,7 +1100,7 @@
+@@ -1168,7 +1169,7 @@
  #endif
        else if (examine_directory (menu, &state, LastDir, prefix) == -1)
          goto bail;
@@ -128,7 +128,7 @@
 +      init_menu (&state, menu, title, sizeof (title), buffy, 1);
        break;
  
-       case OP_BROWSER_NEW_FILE:
+       case OP_BUFFY_LIST:
 --- mutt-1.3.23-orig/menu.c    Sun Oct 28 19:35:26 2001
 +++ mutt-1.3.23/menu.c Wed Oct 31 09:30:28 2001
 @@ -126,14 +126,14 @@