Remove the OP_PAGER_EXIT opcode, and change it to OP_EXIT.

diff --git a/OPS b/OPS
index b615035417fbeea22c34942a92606994ad7becd4..b60e5efc58282366ca859915b7c736a5e562c4b4 100644 (file)
--- a/OPS
+++ b/OPS
@@ -119,7 +119,6 @@ OP_NEXT_ENTRY "move to the next entry"
 OP_NEXT_LINE "scroll down one line"
 OP_NEXT_PAGE "move to the next page"
 OP_PAGER_BOTTOM "jump to the bottom of the message"
-OP_PAGER_EXIT "return to the main-menu"
 OP_PAGER_HIDE_QUOTED "toggle display of quoted text"
 OP_PAGER_SKIP_QUOTED "skip beyond quoted text"
 OP_PAGER_TOP "jump to the top of the message"

diff --git a/functions.h b/functions.h
index 7384930ce5af4e6dbb2ab44e43f66fc78e5c96b8..4087f9ccb331ded5769a0f2b95faab686d2fe0b6 100644 (file)
--- a/functions.h
+++ b/functions.h
@@ -161,7 +161,7 @@ struct binding_t OpPager[] = {
   { "flag-message",    OP_FLAG_MESSAGE,                "F" },
   { "group-reply",     OP_GROUP_REPLY,                 "g" },
   { "display-toggle-weed",     OP_DISPLAY_HEADERS,             "h" },
-  { "exit",            OP_PAGER_EXIT,                  "i" },
+  { "exit",            OP_EXIT,                        "i" },
   { "next-undeleted",  OP_MAIN_NEXT_UNDELETED,         "j" },
   { "next-entry",      OP_NEXT_ENTRY,                  "J" },
   { "previous-undeleted",OP_MAIN_PREV_UNDELETED,       "k" },

diff --git a/keymap.c b/keymap.c
index 397e5fc6bccea3dafca9c383124d0082b7f4f222..6e0cfa60652e210e82b4e12bdbb7947b5b65d477 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -588,8 +588,8 @@ void km_init (void)
 
   km_bindkey ("<enter>", MENU_MAIN, OP_DISPLAY_MESSAGE);
 
-  km_bindkey ("x", MENU_PAGER, OP_PAGER_EXIT);
-  km_bindkey ("q", MENU_PAGER, OP_PAGER_EXIT);
+  km_bindkey ("x", MENU_PAGER, OP_EXIT);
+  km_bindkey ("q", MENU_PAGER, OP_EXIT);
   km_bindkey ("<backspace>", MENU_PAGER, OP_PREV_LINE);
   km_bindkey ("<pagedown>", MENU_PAGER, OP_NEXT_PAGE);
   km_bindkey ("<pageup>", MENU_PAGER, OP_PREV_PAGE);

diff --git a/pager.c b/pager.c
index 217c4f8f5c4fef1e94aef0fb6eb00b9e485e73cb..6f530eee9493b0ab7eff61f2c5a34c8a89bc85f2 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1379,15 +1379,15 @@ upNLines (int nlines, struct line_t *info, int cur, int hiding)
 }
 
 static struct mapping_t PagerHelp[] = {
-  { N_("Exit"),        OP_PAGER_EXIT },
-  { N_("PrevPg"),      OP_PREV_PAGE },
+  { N_("Exit"),        OP_EXIT },
+  { N_("PrevPg"), OP_PREV_PAGE },
   { N_("NextPg"), OP_NEXT_PAGE },
   { NULL,      0 }
 };
 static struct mapping_t PagerHelpExtra[] = {
-  { N_("View Attachm."),       OP_VIEW_ATTACHMENTS },
-  { N_("Del"), OP_DELETE },
-  { N_("Reply"),       OP_REPLY },
+  { N_("View Attachm."), OP_VIEW_ATTACHMENTS },
+  { N_("Del"), OP_DELETE },
+  { N_("Reply"), OP_REPLY },
   { N_("Next"),        OP_MAIN_NEXT_UNDELETED },
   { NULL,      0 }
 };
@@ -1764,7 +1764,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
 
     switch (ch)
     {
-      case OP_PAGER_EXIT:
+      case OP_EXIT:
        rc = -1;
        ch = -1;
        break;