X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_main.c;h=c9ec57f676f194e727c8230ccf5726247a5bd82e;hp=8cf1dff18bec90e83f2dd2d26c3f6f75154edff7;hb=d83b0f623c1ee8a3e337d3ee9992242e458eb4d0;hpb=9a1805afc94b21d8766e6e67ef57f92aaf966e84

diff --git a/curs_main.c b/curs_main.c
index 8cf1dff..c9ec57f 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -41,6 +41,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -591,14 +592,15 @@ int mutt_index_menu (void)
 
       if (option (OPTARROWCURSOR))
         move (menu->current - menu->top + menu->offset, 2);
+       else if (option (OPTBRAILLEFRIENDLY))
+         move (menu->current - menu->top + menu->offset, 0);
       else
         move (menu->current - menu->top + menu->offset, COLS - 1);
       mutt_refresh ();
 
       op = km_dokey (MENU_MAIN);
 
-      dprint (4,
-              (debugfile, "mutt_index_menu[%d]: Got op %d\n", __LINE__, op));
+      debug_print (4, ("Got op %d\n", op));
 
 #if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
       if (SigWinch) {
@@ -1203,7 +1205,8 @@ int mutt_index_menu (void)
       {
         if (Context && Context->path)
           strncpy (buf, Context->path, sizeof (buf));
-        buffy_next (buf, sizeof (buf));
+	if (op != OP_SIDEBAR_OPEN)
+	  buffy_next (buf, sizeof (buf));
       }
 
       if (op == OP_SIDEBAR_OPEN) {
@@ -1225,7 +1228,6 @@ int mutt_index_menu (void)
       else
 #endif
         mutt_expand_path (buf, sizeof (buf));
-      sidebar_set_current (buf);
       if (mx_get_magic (buf) <= 0) {
         mutt_error (_("%s is not a mailbox."), buf);
         break;
@@ -1270,6 +1272,7 @@ int mutt_index_menu (void)
       }
       else
         menu->current = 0;
+      sidebar_set_current (buf);
 
 #ifdef USE_NNTP
       /* buffy_check() must be done with mail-reader mode! */