Rename next-folder to next-unread-mailbox. Remove default binding.

diff --git a/OPS b/OPS
index 5853ad32da4213833d4148c217e7880cc7803393..3efddbb63469057b3a092d6b11c8af755106815b 100644 (file)
--- a/OPS
+++ b/OPS
@@ -107,7 +107,7 @@ OP_MAIN_FIRST_MESSAGE "move to the first message"
 OP_MAIN_LAST_MESSAGE "move to the last message"
 OP_MAIN_LIMIT "show only messages matching a pattern"
 OP_MAIN_LINK_THREADS "link tagged message to the current one"
-OP_MAIN_NEXT_FOLDER "open next folder with new mail"
+OP_MAIN_NEXT_UNREAD_MAILBOX "open next mailbox with new mail"
 OP_MAIN_NEXT_NEW "jump to the next new message"
 OP_MAIN_NEXT_NEW_THEN_UNREAD "jump to the next new or unread message"
 OP_MAIN_NEXT_SUBTHREAD "jump to the next subthread"

diff --git a/UPDATING b/UPDATING
index 42dcfc14452ace8e30a2ff057f5d08e96817f10f..c8f94fc21d884a4b44307e166bb20655db1df91f 100644 (file)
--- a/UPDATING
+++ b/UPDATING
@@ -4,6 +4,7 @@ mutt. Please read this file carefully when upgrading your installation.
 The keys used are:
   !: modified feature, -: deleted feature, +: new feature
 
+  + next-unread-mailbox
   + $message_cache_clean (clean cache on sync)
 
 1.5.15 (2007-04-06)

diff --git a/curs_main.c b/curs_main.c
index 88e34137bca401225f04d616cb71b351f8323770..8e26dedbf4cd05ec4a3a943042b210c7b8072e12 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -1052,7 +1052,7 @@ int mutt_index_menu (void)
        break;
 
       case OP_MAIN_CHANGE_FOLDER:
-      case OP_MAIN_NEXT_FOLDER:
+      case OP_MAIN_NEXT_UNREAD_MAILBOX:
       
        if (attach_msg)
          op = OP_MAIN_CHANGE_FOLDER_READONLY;
@@ -1067,14 +1067,14 @@ int mutt_index_menu (void)
           cp = _("Open mailbox");
 
        buf[0] = '\0';
-       if ((op == OP_MAIN_NEXT_FOLDER) && Context && Context->path)
+       if ((op == OP_MAIN_NEXT_UNREAD_MAILBOX) && Context && Context->path)
        {
          strfcpy (buf, Context->path, sizeof (buf));
          mutt_pretty_mailbox (buf);
          mutt_buffy (buf, sizeof (buf));
          if (!buf[0])
          {
-           mutt_error _("No new messages");
+           mutt_error _("No mailboxes have new mail");
            break;
          }
        }

diff --git a/functions.h b/functions.h
index 92386c4bdc5836dffcbeff33d8db40cb16e9929d..0464bb175be48f86b88510129811b96c148bd268 100644 (file)
--- a/functions.h
+++ b/functions.h
@@ -88,7 +88,7 @@ struct binding_t OpMain[] = { /* map: index */
   { "break-thread",            OP_MAIN_BREAK_THREAD,           "#" },
   { "change-folder",           OP_MAIN_CHANGE_FOLDER,          "c" },
   { "change-folder-readonly",  OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" },
-  { "next-folder",             OP_MAIN_NEXT_FOLDER,            "," },
+  { "next-unread-mailbox",     OP_MAIN_NEXT_UNREAD_MAILBOX,    NULL },
   { "collapse-thread",         OP_MAIN_COLLAPSE_THREAD,        "\033v" },
   { "collapse-all",            OP_MAIN_COLLAPSE_ALL,           "\033V" },
   { "copy-message",            OP_COPY_MESSAGE,                "C" },
@@ -177,7 +177,7 @@ struct binding_t OpPager[] = { /* map: pager */
   { "bounce-message",  OP_BOUNCE_MESSAGE,              "b" },
   { "change-folder",   OP_MAIN_CHANGE_FOLDER,          "c" },
   { "change-folder-readonly",  OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" },
-  { "next-folder",     OP_MAIN_NEXT_FOLDER,            "," },
+  { "next-unread-mailbox",     OP_MAIN_NEXT_UNREAD_MAILBOX, NULL },
   { "copy-message",    OP_COPY_MESSAGE,                "C" },
   { "decode-copy",     OP_DECODE_COPY,                 "\033C" },
   { "delete-message",  OP_DELETE,                      "d" },