]> granicus.if.org Git - neomutt/commitdiff
fix 80 column limit, align statements
authortoogley <toogley@mailbox.org>
Sat, 11 Feb 2017 21:39:47 +0000 (22:39 +0100)
committerRichard Russon <rich@flatcap.org>
Mon, 20 Feb 2017 17:15:36 +0000 (17:15 +0000)
charset.c
functions.h

index 2f2e9bfe2997ad926a09a7cf8b34e5298e4282fa..9c2ed0dcc5e5a5fbcc8c4ff2b10610bed06a52d8 100644 (file)
--- a/charset.c
+++ b/charset.c
 
 /* 
  * The following list has been created manually from the data under:
- * http://www.isi.edu/in-notes/iana/assignments/character-sets
- * Last update: 2000-09-07
+ * http://www.isi.edu/in-notes/iana/assignments/character-sets Last update:
+ * 2000-09-07
  *
- * Note that it includes only the subset of character sets for which
- * a preferred MIME name is given.
+ * Note that it includes only the subset of character sets for which a preferred
+ * MIME name is given.
  */
 
 static const struct 
@@ -57,160 +57,159 @@ static const struct
 }
 PreferredMIMENames[] = 
 {
-  { "ansi_x3.4-1968",  "us-ascii"      },
-  { "iso-ir-6",                "us-ascii"      },
-  { "iso_646.irv:1991",        "us-ascii"      },
-  { "ascii",           "us-ascii"      },
-  { "iso646-us",       "us-ascii"      },
-  { "us",              "us-ascii"      },
-  { "ibm367",          "us-ascii"      },
-  { "cp367",           "us-ascii"      },
-  { "csASCII",         "us-ascii"      },
-  
-  { "csISO2022KR",     "iso-2022-kr"   },
-  { "csEUCKR",         "euc-kr"        },
-  { "csISO2022JP",     "iso-2022-jp"   },
-  { "csISO2022JP2",    "iso-2022-jp-2" },
-
-  { "ISO_8859-1:1987", "iso-8859-1"    },
-  { "iso-ir-100",      "iso-8859-1"    },
-  { "iso_8859-1",      "iso-8859-1"    },
-  { "latin1",          "iso-8859-1"    },
-  { "l1",              "iso-8859-1"    },
-  { "IBM819",          "iso-8859-1"    },
-  { "CP819",           "iso-8859-1"    },
-  { "csISOLatin1",     "iso-8859-1"    },
-  
-  { "ISO_8859-2:1987", "iso-8859-2"    },
-  { "iso-ir-101",      "iso-8859-2"    },
-  { "iso_8859-2",      "iso-8859-2"    },
-  { "latin2",          "iso-8859-2"    },
-  { "l2",              "iso-8859-2"    },
-  { "csISOLatin2",     "iso-8859-2"    },
-  
-  { "ISO_8859-3:1988", "iso-8859-3"    },
-  { "iso-ir-109",      "iso-8859-3"    },
-  { "ISO_8859-3",      "iso-8859-3"    },
-  { "latin3",          "iso-8859-3"    },
-  { "l3",              "iso-8859-3"    },
-  { "csISOLatin3",     "iso-8859-3"    },
-
-  { "ISO_8859-4:1988", "iso-8859-4"    },
-  { "iso-ir-110",      "iso-8859-4"    },
-  { "ISO_8859-4",      "iso-8859-4"    },
-  { "latin4",          "iso-8859-4"    },
-  { "l4",              "iso-8859-4"    },
-  { "csISOLatin4",     "iso-8859-4"    },
-
-  { "ISO_8859-6:1987", "iso-8859-6"    },
-  { "iso-ir-127",      "iso-8859-6"    },
-  { "iso_8859-6",      "iso-8859-6"    },
-  { "ECMA-114",                "iso-8859-6"    },
-  { "ASMO-708",                "iso-8859-6"    },
-  { "arabic",          "iso-8859-6"    },
-  { "csISOLatinArabic",        "iso-8859-6"    },
-  
-  { "ISO_8859-7:1987", "iso-8859-7"    },
-  { "iso-ir-126",      "iso-8859-7"    },
-  { "ISO_8859-7",      "iso-8859-7"    },
-  { "ELOT_928",                "iso-8859-7"    },
-  { "ECMA-118",                "iso-8859-7"    },
-  { "greek",           "iso-8859-7"    },
-  { "greek8",          "iso-8859-7"    },
-  { "csISOLatinGreek", "iso-8859-7"    },
-  
-  { "ISO_8859-8:1988", "iso-8859-8"    },
-  { "iso-ir-138",      "iso-8859-8"    },
-  { "ISO_8859-8",      "iso-8859-8"    },
-  { "hebrew",          "iso-8859-8"    },
-  { "csISOLatinHebrew",        "iso-8859-8"    },
-
-  { "ISO_8859-5:1988", "iso-8859-5"    },
-  { "iso-ir-144",      "iso-8859-5"    },
-  { "ISO_8859-5",      "iso-8859-5"    },
-  { "cyrillic",                "iso-8859-5"    },
-  { "csISOLatinCyrillic", "iso-8859-5" },
-
-  { "ISO_8859-9:1989", "iso-8859-9"    },
-  { "iso-ir-148",      "iso-8859-9"    },
-  { "ISO_8859-9",      "iso-8859-9"    },
-  { "latin5",          "iso-8859-9"    }, /* this is not a bug */
-  { "l5",              "iso-8859-9"    },
-  { "csISOLatin5",     "iso-8859-9"    },
-  
-  { "ISO_8859-10:1992",        "iso-8859-10"   },
-  { "iso-ir-157",      "iso-8859-10"   },
-  { "latin6",          "iso-8859-10"   }, /* this is not a bug */
-  { "l6",              "iso-8859-10"   },
-  { "csISOLatin6",     "iso-8859-10"   }, 
-  
-  { "csKOI8r",         "koi8-r"        },
-  
-  { "MS_Kanji",                "Shift_JIS"     }, /* Note the underscore! */
-  { "csShiftJis",      "Shift_JIS"     },
-  
+  { "ansi_x3.4-1968",        "us-ascii"      },
+  { "iso-ir-6",              "us-ascii"      },
+  { "iso_646.irv:1991",      "us-ascii"      },
+  { "ascii",                 "us-ascii"      },
+  { "iso646-us",             "us-ascii"      },
+  { "us",                    "us-ascii"      },
+  { "ibm367",                "us-ascii"      },
+  { "cp367",                 "us-ascii"      },
+  { "csASCII",               "us-ascii"      },
+
+  { "csISO2022KR",           "iso-2022-kr"   },
+  { "csEUCKR",               "euc-kr"        },
+  { "csISO2022JP",           "iso-2022-jp"   },
+  { "csISO2022JP2",          "iso-2022-jp-2" },
+
+  { "ISO_8859-1:1987",       "iso-8859-1"    },
+  { "iso-ir-100",            "iso-8859-1"    },
+  { "iso_8859-1",            "iso-8859-1"    },
+  { "latin1",                "iso-8859-1"    },
+  { "l1",                    "iso-8859-1"    },
+  { "IBM819",                "iso-8859-1"    },
+  { "CP819",                 "iso-8859-1"    },
+  { "csISOLatin1",           "iso-8859-1"    },
+
+  { "ISO_8859-2:1987",       "iso-8859-2"    },
+  { "iso-ir-101",            "iso-8859-2"    },
+  { "iso_8859-2",            "iso-8859-2"    },
+  { "latin2",                "iso-8859-2"    },
+  { "l2",                    "iso-8859-2"    },
+  { "csISOLatin2",           "iso-8859-2"    },
+
+  { "ISO_8859-3:1988",       "iso-8859-3"    },
+  { "iso-ir-109",            "iso-8859-3"    },
+  { "ISO_8859-3",            "iso-8859-3"    },
+  { "latin3",                "iso-8859-3"    },
+  { "l3",                    "iso-8859-3"    },
+  { "csISOLatin3",           "iso-8859-3"    },
+
+  { "ISO_8859-4:1988",       "iso-8859-4"    },
+  { "iso-ir-110",            "iso-8859-4"    },
+  { "ISO_8859-4",            "iso-8859-4"    },
+  { "latin4",                "iso-8859-4"    },
+  { "l4",                    "iso-8859-4"    },
+  { "csISOLatin4",           "iso-8859-4"    },
+
+  { "ISO_8859-6:1987",       "iso-8859-6"    },
+  { "iso-ir-127",            "iso-8859-6"    },
+  { "iso_8859-6",            "iso-8859-6"    },
+  { "ECMA-114",              "iso-8859-6"    },
+  { "ASMO-708",              "iso-8859-6"    },
+  { "arabic",                "iso-8859-6"    },
+  { "csISOLatinArabic",      "iso-8859-6"    },
+
+  { "ISO_8859-7:1987",       "iso-8859-7"    },
+  { "iso-ir-126",            "iso-8859-7"    },
+  { "ISO_8859-7",            "iso-8859-7"    },
+  { "ELOT_928",              "iso-8859-7"    },
+  { "ECMA-118",              "iso-8859-7"    },
+  { "greek",                 "iso-8859-7"    },
+  { "greek8",                "iso-8859-7"    },
+  { "csISOLatinGreek",       "iso-8859-7"    },
+
+  { "ISO_8859-8:1988",       "iso-8859-8"    },
+  { "iso-ir-138",            "iso-8859-8"    },
+  { "ISO_8859-8",            "iso-8859-8"    },
+  { "hebrew",                "iso-8859-8"    },
+  { "csISOLatinHebrew",      "iso-8859-8"    },
+
+  { "ISO_8859-5:1988",       "iso-8859-5"    },
+  { "iso-ir-144",            "iso-8859-5"    },
+  { "ISO_8859-5",            "iso-8859-5"    },
+  { "cyrillic",              "iso-8859-5"    },
+  { "csISOLatinCyrillic",    "iso-8859-5"    },
+
+  { "ISO_8859-9:1989",       "iso-8859-9"    },
+  { "iso-ir-148",            "iso-8859-9"    },
+  { "ISO_8859-9",            "iso-8859-9"    },
+  { "latin5",                "iso-8859-9"    },   /* this is not a bug */
+  { "l5",                    "iso-8859-9"    },
+  { "csISOLatin5",           "iso-8859-9"    },
+
+  { "ISO_8859-10:1992",      "iso-8859-10"   },
+  { "iso-ir-157",            "iso-8859-10"   },
+  { "latin6",                "iso-8859-10"   },   /* this is not a bug */
+  { "l6",                    "iso-8859-10"   },
+  { "csISOLatin6",           "iso-8859-10"   },
+
+  { "csKOI8r",               "koi8-r"        },
+
+  { "MS_Kanji",              "Shift_JIS"     },     /* Note the underscore! */
+  { "csShiftJis",            "Shift_JIS"     },
+
   { "Extended_UNIX_Code_Packed_Format_for_Japanese",
-                       "euc-jp"        },
-  { "csEUCPkdFmtJapanese", 
-                       "euc-jp"        },
-  
-  { "csGB2312",                "gb2312"        },
-  { "csbig5",          "big5"          },
+                             "euc-jp"        },
+  { "csEUCPkdFmtJapanese",   "euc-jp"        },
+
+  { "csGB2312",              "gb2312"        },
+  { "csbig5",                "big5"          },
 
-  /* 
-   * End of official brain damage.  What follows has been taken
-   * from glibc's localedata files. 
+  /*
+   * End of official brain damage. What follows has been taken from glibc's
+   * localedata files.
    */
 
-  { "iso_8859-13",     "iso-8859-13"   },
-  { "iso-ir-179",      "iso-8859-13"   },
-  { "latin7",          "iso-8859-13"   }, /* this is not a bug */
-  { "l7",              "iso-8859-13"   },
-  
-  { "iso_8859-14",     "iso-8859-14"   },
-  { "latin8",          "iso-8859-14"   }, /* this is not a bug */
-  { "l8",              "iso-8859-14"   },
+  { "iso_8859-13",           "iso-8859-13"   },
+  { "iso-ir-179",            "iso-8859-13"   },
+  { "latin7",                "iso-8859-13"   },  /* this is not a bug */
+  { "l7",                    "iso-8859-13"   },
 
-  { "iso_8859-15",     "iso-8859-15"   },
-  { "latin9",          "iso-8859-15"   }, /* this is not a bug */
+  { "iso_8859-14",           "iso-8859-14"   },
+  { "latin8",                "iso-8859-14"   },  /* this is not a bug */
+  { "l8",                    "iso-8859-14"   },
+
+  { "iso_8859-15",           "iso-8859-15"   },
+  { "latin9",                "iso-8859-15"   },  /* this is not a bug */
 
   /* Suggested by Ionel Mugurel Ciobica <tgakic@sg10.chem.tue.nl> */
-  { "latin0",           "iso-8859-15"   }, /* this is not a bug */
-  
-  { "iso_8859-16",      "iso-8859-16"   },
-  { "latin10",          "iso-8859-16"   }, /* this is not a bug */
-  
-  /* 
+  { "latin0",                "iso-8859-15"   }, /* this is not a bug */
+
+  { "iso_8859-16",           "iso-8859-16"   },
+  { "latin10",               "iso-8859-16"   }, /* this is not a bug */
+
+  /*
    * David Champion <dgc@uchicago.edu> has observed this with
-   * nl_langinfo under SunOS 5.8. 
+   * nl_langinfo under SunOS 5.8.
    */
-  
-  { "646",             "us-ascii"      },
-  
-  /* 
+
+  { "646",                   "us-ascii"      },
+
+  /*
    * http://www.sun.com/software/white-papers/wp-unicode/
    */
 
-  { "eucJP",           "euc-jp"        },
-  { "PCK",             "Shift_JIS"     },
-  { "ko_KR-euc",       "euc-kr"        },
-  { "zh_TW-big5",      "big5"          },
+  { "eucJP",                 "euc-jp"        },
+  { "PCK",                   "Shift_JIS"     },
+  { "ko_KR-euc",             "euc-kr"        },
+  { "zh_TW-big5",            "big5"          },
 
   /* seems to be common on some systems */
 
-  { "sjis",            "Shift_JIS"     },
-  { "euc-jp-ms",       "eucJP-ms"      },
+  { "sjis",                  "Shift_JIS"     },
+  { "euc-jp-ms",             "eucJP-ms"      },
 
 
   /*
-   * If you happen to encounter system-specific brain-damage with
-   * respect to character set naming, please add it above this
-   * comment, and submit a patch to <mutt-dev@mutt.org>. 
+   * If you happen to encounter system-specific brain-damage with respect to
+   * character set naming, please add it above this comment, and submit a patch
+   * to <mutt-dev@mutt.org>.
    */
-  
+
   /* End of aliases.  Please keep this line last. */
-  
-  { NULL,              NULL            }
+
+  { NULL,                     NULL           }
 };
 
 #ifdef HAVE_LANGINFO_CODESET
@@ -347,17 +346,16 @@ int iconv_close (iconv_t cd)
 
 
 /*
- * Like iconv_open, but canonicalises the charsets, applies
- * charset-hooks, recanonicalises, and finally applies iconv-hooks.
- * Parameter flags=0 skips charset-hooks, while MUTT_ICONV_HOOK_FROM
- * applies them to fromcode. Callers should use flags=0 when fromcode
- * can safely be considered true, either some constant, or some value
- * provided by the user; MUTT_ICONV_HOOK_FROM should be used only when
- * fromcode is unsure, taken from a possibly wrong incoming MIME label,
- * or such. Misusing MUTT_ICONV_HOOK_FROM leads to unwanted interactions
- * in some setups. Note: By design charset-hooks should never be, and
- * are never, applied to tocode. Highlight note: The top-well-named
- * MUTT_ICONV_HOOK_FROM acts on charset-hooks, not at all on iconv-hooks.
+ * Like iconv_open, but canonicalises the charsets, applies charset-hooks,
+ * recanonicalises, and finally applies iconv-hooks. Parameter flags=0 skips
+ * charset-hooks, while MUTT_ICONV_HOOK_FROM applies them to fromcode. Callers
+ * should use flags=0 when fromcode can safely be considered true, either some
+ * constant, or some value provided by the user; MUTT_ICONV_HOOK_FROM should be
+ * used only when fromcode is unsure, taken from a possibly wrong incoming MIME
+ * label, or such. Misusing MUTT_ICONV_HOOK_FROM leads to unwanted interactions
+ * in some setups. Note: By design charset-hooks should never be, and are never,
+ * applied to tocode. Highlight note: The top-well-named MUTT_ICONV_HOOK_FROM
+ * acts on charset-hooks, not at all on iconv-hooks.
  */
 
 iconv_t mutt_iconv_open (const char *tocode, const char *fromcode, int flags)
@@ -519,8 +517,8 @@ int mutt_convert_string (char **ps, const char *from, const char *to, int flags)
 
 
 /*
- * FGETCONV stuff for converting a file while reading it
- * Used in sendlib.c for converting from mutt's Charset
+ * FGETCONV stuff for converting a file while reading it Used in sendlib.c for
+ * converting from mutt's Charset
  */
 
 struct fgetconv_s
@@ -543,8 +541,8 @@ struct fgetconv_not
 };
 
 /*
- * Parameter flags is given as-is to mutt_iconv_open(). See there
- * for its meaning and usage policy.
+ * Parameter flags is given as-is to mutt_iconv_open(). See there for its
+ * meaning and usage policy.
  */
 FGETCONV *fgetconv_open (FILE *file, const char *from, const char *to, int flags)
 {
index b09a537023b06d9af924fb84210da87f7f9dbd9e..ec8f923f0d557f6a7636a1b0d3d6112ab2f13072 100644 (file)
@@ -1,20 +1,20 @@
 /*
  * Copyright (C) 1996-2000,2002 Michael R. Elkins <me@mutt.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
+ *
+ *     This program is free software; you can redistribute it and/or modify it
+ *     under the terms of the GNU General Public License as published by the
+ *     Free Software Foundation; either version 2 of the License, or (at your
+ *     option) any later version.
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */ 
+ *
+ *     You should have received a copy of the GNU General Public License along
+ *     with this program; if not, write to the Free Software Foundation, Inc.,
+ *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 /*
  * This file contains the structures needed to parse ``bind'' commands, as
@@ -44,504 +44,498 @@ const struct binding_t OpGeneric[] = { /* map: generic */
   ** bindings for all menus (except as noted).
   ** </para>
   */
-  { "top-page",                OP_TOP_PAGE,            "H" },
-  { "next-entry",      OP_NEXT_ENTRY,          "j" },
-  { "previous-entry",  OP_PREV_ENTRY,          "k" },
-  { "bottom-page",     OP_BOTTOM_PAGE,         "L" },
-  { "refresh",         OP_REDRAW,              "\014" },
-  { "middle-page",     OP_MIDDLE_PAGE,         "M" },
-  { "search-next",     OP_SEARCH_NEXT,         "n" },
-  { "exit",            OP_EXIT,                "q" },
-  { "tag-entry",       OP_TAG,                 "t" },
-  { "next-page",       OP_NEXT_PAGE,           "z" },
-  { "previous-page",   OP_PREV_PAGE,           "Z" },
-  { "last-entry",      OP_LAST_ENTRY,          "*" },
-  { "first-entry",     OP_FIRST_ENTRY,         "=" },
-  { "enter-command",   OP_ENTER_COMMAND,       ":" },
-  { "next-line",       OP_NEXT_LINE,           ">" },
-  { "previous-line",   OP_PREV_LINE,           "<" },
-  { "half-up",         OP_HALF_UP,             "[" },
-  { "half-down",       OP_HALF_DOWN,           "]" },
-  { "help",            OP_HELP,                "?" },
-  { "tag-prefix",      OP_TAG_PREFIX,          ";" },
-  { "tag-prefix-cond", OP_TAG_PREFIX_COND,     NULL },
-  { "end-cond",                OP_END_COND,            NULL },
-  { "shell-escape",    OP_SHELL_ESCAPE,        "!" },
-  { "select-entry",    OP_GENERIC_SELECT_ENTRY,"\n" },
-  { "select-entry",    OP_GENERIC_SELECT_ENTRY,"\r" },
-  { "search",          OP_SEARCH,              "/" },
-  { "search-reverse",  OP_SEARCH_REVERSE,      "\033/" },
-  { "search-opposite", OP_SEARCH_OPPOSITE,     NULL },
-  { "jump",            OP_JUMP,                NULL },
-  { "current-top",      OP_CURRENT_TOP,                NULL },
-  { "current-middle",   OP_CURRENT_MIDDLE,     NULL },
-  { "current-bottom",   OP_CURRENT_BOTTOM,     NULL },
-  { "what-key",                OP_WHAT_KEY,            NULL },
-  { NULL,              0,                      NULL }
+  { "top-page",        OP_TOP_PAGE,             "H" },
+  { "next-entry",      OP_NEXT_ENTRY,           "j" },
+  { "previous-entry",  OP_PREV_ENTRY,           "k" },
+  { "bottom-page",     OP_BOTTOM_PAGE,          "L" },
+  { "refresh",         OP_REDRAW,               "\014" },
+  { "middle-page",     OP_MIDDLE_PAGE,          "M" },
+  { "search-next",     OP_SEARCH_NEXT,          "n" },
+  { "exit",            OP_EXIT,                 "q" },
+  { "tag-entry",       OP_TAG,                  "t" },
+  { "next-page",       OP_NEXT_PAGE,            "z" },
+  { "previous-page",   OP_PREV_PAGE,            "Z" },
+  { "last-entry",      OP_LAST_ENTRY,           "*" },
+  { "first-entry",     OP_FIRST_ENTRY,          "=" },
+  { "enter-command",   OP_ENTER_COMMAND,        ":" },
+  { "next-line",       OP_NEXT_LINE,            ">" },
+  { "previous-line",   OP_PREV_LINE,            "<" },
+  { "half-up",         OP_HALF_UP,              "[" },
+  { "half-down",       OP_HALF_DOWN,            "]" },
+  { "help",            OP_HELP,                 "?" },
+  { "tag-prefix",      OP_TAG_PREFIX,           ";" },
+  { "tag-prefix-cond", OP_TAG_PREFIX_COND,      NULL },
+  { "end-cond",        OP_END_COND,             NULL },
+  { "shell-escape",    OP_SHELL_ESCAPE,         "!" },
+  { "select-entry",    OP_GENERIC_SELECT_ENTRY, "\n" },
+  { "select-entry",    OP_GENERIC_SELECT_ENTRY, "\r" },
+  { "search",          OP_SEARCH,               "/" },
+  { "search-reverse",  OP_SEARCH_REVERSE,       "\033/" },
+  { "search-opposite", OP_SEARCH_OPPOSITE,      NULL },
+  { "jump",            OP_JUMP,                 NULL },
+  { "current-top",     OP_CURRENT_TOP,          NULL },
+  { "current-middle",  OP_CURRENT_MIDDLE,       NULL },
+  { "current-bottom",  OP_CURRENT_BOTTOM,       NULL },
+  { "what-key",        OP_WHAT_KEY,             NULL },
+  { NULL,              0,                       NULL }
 };
 
 const struct binding_t OpMain[] = { /* map: index */
-  { "create-alias",            OP_CREATE_ALIAS,                "a" },
-  { "bounce-message",          OP_BOUNCE_MESSAGE,              "b" },
-  { "break-thread",            OP_MAIN_BREAK_THREAD,           "#" },
-  { "change-folder",           OP_MAIN_CHANGE_FOLDER,          "c" },
-  { "change-folder-readonly",  OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" },
+  { "create-alias",              OP_CREATE_ALIAS,                   "a" },
+  { "bounce-message",            OP_BOUNCE_MESSAGE,                 "b" },
+  { "break-thread",              OP_MAIN_BREAK_THREAD,              "#" },
+  { "change-folder",             OP_MAIN_CHANGE_FOLDER,             "c" },
+  { "change-folder-readonly",    OP_MAIN_CHANGE_FOLDER_READONLY,    "\033c" },
 #ifdef USE_NNTP
-  { "change-newsgroup",                OP_MAIN_CHANGE_GROUP,           NULL },
-  { "change-newsgroup-readonly",OP_MAIN_CHANGE_GROUP_READONLY, NULL },
+  { "change-newsgroup",          OP_MAIN_CHANGE_GROUP,              NULL },
+  { "change-newsgroup-readonly", OP_MAIN_CHANGE_GROUP_READONLY,     NULL },
 #endif
-  { "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" },
-  { "decode-copy",             OP_DECODE_COPY,                 "\033C" },
-  { "decode-save",             OP_DECODE_SAVE,                 "\033s" },
-  { "delete-message",          OP_DELETE,                      "d" },
-  { "delete-pattern",          OP_MAIN_DELETE_PATTERN,         "D" },
-  { "delete-thread",           OP_DELETE_THREAD,               "\004" },
-  { "delete-subthread",                OP_DELETE_SUBTHREAD,            "\033d" },
-  { "edit",                    OP_EDIT_MESSAGE,                "e" },
-  { "edit-label",              OP_EDIT_LABEL,                  "Y" },
-  { "edit-type",               OP_EDIT_TYPE,                   "\005" },
-  { "forward-message",         OP_FORWARD_MESSAGE,             "f" },
+  { "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" },
+  { "decode-copy",               OP_DECODE_COPY,                    "\033C" },
+  { "decode-save",               OP_DECODE_SAVE,                    "\033s" },
+  { "delete-message",            OP_DELETE,                         "d" },
+  { "delete-pattern",            OP_MAIN_DELETE_PATTERN,            "D" },
+  { "delete-thread",             OP_DELETE_THREAD,                  "\004" },
+  { "delete-subthread",          OP_DELETE_SUBTHREAD,               "\033d" },
+  { "edit",                      OP_EDIT_MESSAGE,                   "e" },
+  { "edit-label",                OP_EDIT_LABEL,                     "Y" },
+  { "edit-type",                 OP_EDIT_TYPE,                      "\005" },
+  { "forward-message",           OP_FORWARD_MESSAGE,                "f" },
 #ifdef USE_NNTP
-  { "forward-to-group",                OP_FORWARD_TO_GROUP,            NULL },
-  { "followup-message",                OP_FOLLOWUP,                    NULL },
-  { "get-children",            OP_GET_CHILDREN,                NULL },
-  { "get-message",             OP_GET_MESSAGE,                 NULL },
-  { "get-parent",              OP_GET_PARENT,                  NULL },
-  { "reconstruct-thread",      OP_RECONSTRUCT_THREAD,          NULL },
+  { "forward-to-group",          OP_FORWARD_TO_GROUP,               NULL },
+  { "followup-message",          OP_FOLLOWUP,                       NULL },
+  { "get-children",              OP_GET_CHILDREN,                   NULL },
+  { "get-message",               OP_GET_MESSAGE,                    NULL },
+  { "get-parent",                OP_GET_PARENT,                     NULL },
+  { "reconstruct-thread",        OP_RECONSTRUCT_THREAD,             NULL },
 #endif
-  { "flag-message",            OP_FLAG_MESSAGE,                "F" },
-  { "group-reply",             OP_GROUP_REPLY,                 "g" },
+  { "flag-message",              OP_FLAG_MESSAGE,                   "F" },
+  { "group-reply",               OP_GROUP_REPLY,                    "g" },
 #ifdef USE_POP
-  { "fetch-mail",              OP_MAIN_FETCH_MAIL,             "G" },
+  { "fetch-mail",                OP_MAIN_FETCH_MAIL,                "G" },
 #endif
 #ifdef USE_IMAP
-  { "imap-fetch-mail",         OP_MAIN_IMAP_FETCH,             NULL },
-  { "imap-logout-all",         OP_MAIN_IMAP_LOGOUT_ALL,        NULL },
+  { "imap-fetch-mail",           OP_MAIN_IMAP_FETCH,                NULL },
+  { "imap-logout-all",           OP_MAIN_IMAP_LOGOUT_ALL,           NULL },
 #endif
-  { "display-toggle-weed",             OP_DISPLAY_HEADERS,             "h" },
-  { "next-undeleted",          OP_MAIN_NEXT_UNDELETED,         "j" },
-  { "previous-undeleted",      OP_MAIN_PREV_UNDELETED,         "k" },
-  { "limit",                   OP_MAIN_LIMIT,                  "l" },
-  { "limit-current-thread",    OP_LIMIT_CURRENT_THREAD,        NULL },
-  { "link-threads",            OP_MAIN_LINK_THREADS,           "&" },
-  { "list-reply",              OP_LIST_REPLY,                  "L" },
-  { "mail",                    OP_MAIL,                        "m" },
-  { "toggle-new",              OP_TOGGLE_NEW,                  "N" },
-  { "toggle-write",            OP_TOGGLE_WRITE,                "%" },
-  { "next-thread",             OP_MAIN_NEXT_THREAD,            "\016" },
-  { "next-subthread",          OP_MAIN_NEXT_SUBTHREAD,         "\033n" },
-  { "purge-message",           OP_PURGE_MESSAGE,               NULL },
-  { "purge-thread",            OP_PURGE_THREAD,                NULL },
-  { "query",                   OP_QUERY,                       "Q" },
-  { "quit",                    OP_QUIT,                        "q" },
-  { "reply",                   OP_REPLY,                       "r" },
-  { "show-limit",              OP_MAIN_SHOW_LIMIT,             "\033l" },
-  { "sort-mailbox",            OP_SORT,                        "o" },
-  { "sort-reverse",            OP_SORT_REVERSE,                "O" },
-  { "print-message",           OP_PRINT,                       "p" },
+  { "display-toggle-weed",       OP_DISPLAY_HEADERS,                "h" },
+  { "next-undeleted",            OP_MAIN_NEXT_UNDELETED,            "j" },
+  { "previous-undeleted",        OP_MAIN_PREV_UNDELETED,            "k" },
+  { "limit",                     OP_MAIN_LIMIT,                     "l" },
+  { "limit-current-thread",      OP_LIMIT_CURRENT_THREAD,           NULL },
+  { "link-threads",              OP_MAIN_LINK_THREADS,              "&" },
+  { "list-reply",                OP_LIST_REPLY,                     "L" },
+  { "mail",                      OP_MAIL,                           "m" },
+  { "toggle-new",                OP_TOGGLE_NEW,                     "N" },
+  { "toggle-write",              OP_TOGGLE_WRITE,                   "%" },
+  { "next-thread",               OP_MAIN_NEXT_THREAD,               "\016" },
+  { "next-subthread",            OP_MAIN_NEXT_SUBTHREAD,            "\033n" },
+  { "purge-message",             OP_PURGE_MESSAGE,                  NULL },
+  { "purge-thread",              OP_PURGE_THREAD,                   NULL },
+  { "query",                     OP_QUERY,                          "Q" },
+  { "quit",                      OP_QUIT,                           "q" },
+  { "reply",                     OP_REPLY,                          "r" },
+  { "show-limit",                OP_MAIN_SHOW_LIMIT,                "\033l" },
+  { "sort-mailbox",              OP_SORT,                           "o" },
+  { "sort-reverse",              OP_SORT_REVERSE,                   "O" },
+  { "print-message",             OP_PRINT,                          "p" },
 #ifdef USE_NNTP
-  { "post-message",            OP_POST,                        NULL },
+  { "post-message",              OP_POST,                           NULL },
 #endif
-  { "previous-thread",         OP_MAIN_PREV_THREAD,            "\020" },
-  { "previous-subthread",      OP_MAIN_PREV_SUBTHREAD,         "\033p" },
-  { "recall-message",          OP_RECALL_MESSAGE,              "R" },
-  { "read-thread",             OP_MAIN_READ_THREAD,            "\022" },
-  { "read-subthread",          OP_MAIN_READ_SUBTHREAD,         "\033r" },
-  { "resend-message",          OP_RESEND,                      "\033e" },
-  { "compose-to-sender",       OP_COMPOSE_TO_SENDER,           NULL },
-  { "save-message",            OP_SAVE,                        "s" },
-  { "tag-pattern",             OP_MAIN_TAG_PATTERN,            "T" },
-  { "tag-subthread",           OP_TAG_SUBTHREAD,               NULL },
-  { "tag-thread",              OP_TAG_THREAD,                  "\033t" },
-  { "untag-pattern",           OP_MAIN_UNTAG_PATTERN,          "\024" },
-  { "undelete-message",                OP_UNDELETE,                    "u" },
-  { "undelete-pattern",                OP_MAIN_UNDELETE_PATTERN,       "U"},
-  { "undelete-subthread",      OP_UNDELETE_SUBTHREAD,          "\033u" },
-  { "undelete-thread",         OP_UNDELETE_THREAD,             "\025" },
-  { "view-attachments",                OP_VIEW_ATTACHMENTS,            "v" },
-  { "show-version",            OP_VERSION,                     "V" },
-  { "set-flag",                        OP_MAIN_SET_FLAG,               "w" },
-  { "clear-flag",              OP_MAIN_CLEAR_FLAG,             "W" },
-  { "toggle-read",             OP_TOGGLE_READ,                 NULL },
+  { "previous-thread",           OP_MAIN_PREV_THREAD,               "\020" },
+  { "previous-subthread",        OP_MAIN_PREV_SUBTHREAD,            "\033p" },
+  { "recall-message",            OP_RECALL_MESSAGE,                 "R" },
+  { "read-thread",               OP_MAIN_READ_THREAD,               "\022" },
+  { "read-subthread",            OP_MAIN_READ_SUBTHREAD,            "\033r" },
+  { "resend-message",            OP_RESEND,                         "\033e" },
+  { "compose-to-sender",         OP_COMPOSE_TO_SENDER,              NULL },
+  { "save-message",              OP_SAVE,                           "s" },
+  { "tag-pattern",               OP_MAIN_TAG_PATTERN,               "T" },
+  { "tag-subthread",             OP_TAG_SUBTHREAD,                  NULL },
+  { "tag-thread",                OP_TAG_THREAD,                     "\033t" },
+  { "untag-pattern",             OP_MAIN_UNTAG_PATTERN,             "\024" },
+  { "undelete-message",          OP_UNDELETE,                       "u" },
+  { "undelete-pattern",          OP_MAIN_UNDELETE_PATTERN,          "U"},
+  { "undelete-subthread",        OP_UNDELETE_SUBTHREAD,             "\033u" },
+  { "undelete-thread",           OP_UNDELETE_THREAD,                "\025" },
+  { "view-attachments",          OP_VIEW_ATTACHMENTS,               "v" },
+  { "show-version",              OP_VERSION,                        "V" },
+  { "set-flag",                  OP_MAIN_SET_FLAG,                  "w" },
+  { "clear-flag",                OP_MAIN_CLEAR_FLAG,                "W" },
+  { "toggle-read",               OP_TOGGLE_READ,                    NULL },
 #ifdef USE_NNTP
-  { "catchup",                 OP_CATCHUP,                     NULL },
+  { "catchup",                   OP_CATCHUP,                        NULL },
 #endif
-  { "display-message",         OP_DISPLAY_MESSAGE,             "\n" },
-  { "display-message",         OP_DISPLAY_MESSAGE,             "\r" },
-  { "mark-message",            OP_MARK_MSG,                    "~" },
-  { "buffy-list",              OP_BUFFY_LIST,                  "." },
-  { "sync-mailbox",            OP_MAIN_SYNC_FOLDER,            "$" },
-  { "display-address",         OP_DISPLAY_ADDRESS,             "@" },
-  { "pipe-message",            OP_PIPE,                        "|" },
-  { "next-new",                        OP_MAIN_NEXT_NEW,               NULL },
-  { "next-new-then-unread",    OP_MAIN_NEXT_NEW_THEN_UNREAD,   "\t" },
-  { "previous-new",            OP_MAIN_PREV_NEW,               NULL },
-  { "previous-new-then-unread",        OP_MAIN_PREV_NEW_THEN_UNREAD,   "\033\t" },
-  { "next-unread",             OP_MAIN_NEXT_UNREAD,            NULL },
-  { "previous-unread",         OP_MAIN_PREV_UNREAD,            NULL },
-  { "parent-message",          OP_MAIN_PARENT_MESSAGE,         "P" },
-  { "root-message",            OP_MAIN_ROOT_MESSAGE,           NULL },
-
-
-  { "extract-keys",            OP_EXTRACT_KEYS,                "\013" },
-  { "forget-passphrase",       OP_FORGET_PASSPHRASE,           "\006" },
-  { "check-traditional-pgp",   OP_CHECK_TRADITIONAL,           "\033P" },
-  { "mail-key",                        OP_MAIL_KEY,                    "\033k" },
-  { "decrypt-copy",            OP_DECRYPT_COPY,                NULL },
-  { "decrypt-save",            OP_DECRYPT_SAVE,                NULL },
-  { "quasi-delete",            OP_MAIN_QUASI_DELETE,           NULL },
+  { "display-message",           OP_DISPLAY_MESSAGE,                "\n" },
+  { "display-message",           OP_DISPLAY_MESSAGE,                "\r" },
+  { "mark-message",              OP_MARK_MSG,                       "~" },
+  { "buffy-list",                OP_BUFFY_LIST,                     "." },
+  { "sync-mailbox",              OP_MAIN_SYNC_FOLDER,               "$" },
+  { "display-address",           OP_DISPLAY_ADDRESS,                "@" },
+  { "pipe-message",              OP_PIPE,                           "|" },
+  { "next-new",                  OP_MAIN_NEXT_NEW,                  NULL },
+  { "next-new-then-unread",      OP_MAIN_NEXT_NEW_THEN_UNREAD,      "\t" },
+  { "previous-new",              OP_MAIN_PREV_NEW,                  NULL },
+  { "previous-new-then-unread",  OP_MAIN_PREV_NEW_THEN_UNREAD,      "\033\t" },
+  { "next-unread",               OP_MAIN_NEXT_UNREAD,               NULL },
+  { "previous-unread",           OP_MAIN_PREV_UNREAD,               NULL },
+  { "parent-message",            OP_MAIN_PARENT_MESSAGE,            "P" },
+  { "root-message",              OP_MAIN_ROOT_MESSAGE,              NULL },
+
+
+  { "extract-keys",              OP_EXTRACT_KEYS,                   "\013" },
+  { "forget-passphrase",         OP_FORGET_PASSPHRASE,              "\006" },
+  { "check-traditional-pgp",     OP_CHECK_TRADITIONAL,              "\033P" },
+  { "mail-key",                  OP_MAIL_KEY,                       "\033k" },
+  { "decrypt-copy",              OP_DECRYPT_COPY,                   NULL },
+  { "decrypt-save",              OP_DECRYPT_SAVE,                   NULL },
+  { "quasi-delete",              OP_MAIN_QUASI_DELETE,              NULL },
 
 #ifdef USE_SIDEBAR
-  { "sidebar-next",            OP_SIDEBAR_NEXT,                NULL },
-  { "sidebar-next-new",                OP_SIDEBAR_NEXT_NEW,            NULL },
-  { "sidebar-open",            OP_SIDEBAR_OPEN,                NULL },
-  { "sidebar-page-down",       OP_SIDEBAR_PAGE_DOWN,           NULL },
-  { "sidebar-page-up",         OP_SIDEBAR_PAGE_UP,             NULL },
-  { "sidebar-prev",            OP_SIDEBAR_PREV,                NULL },
-  { "sidebar-prev-new",                OP_SIDEBAR_PREV_NEW,            NULL },
-  { "sidebar-toggle-virtual",  OP_SIDEBAR_TOGGLE_VIRTUAL,      NULL },
-  { "sidebar-toggle-visible",  OP_SIDEBAR_TOGGLE_VISIBLE,      NULL },
+  { "sidebar-next",              OP_SIDEBAR_NEXT,                   NULL },
+  { "sidebar-next-new",          OP_SIDEBAR_NEXT_NEW,               NULL },
+  { "sidebar-open",              OP_SIDEBAR_OPEN,                   NULL },
+  { "sidebar-page-down",         OP_SIDEBAR_PAGE_DOWN,              NULL },
+  { "sidebar-page-up",           OP_SIDEBAR_PAGE_UP,                NULL },
+  { "sidebar-prev",              OP_SIDEBAR_PREV,                   NULL },
+  { "sidebar-prev-new",          OP_SIDEBAR_PREV_NEW,               NULL },
+  { "sidebar-toggle-virtual",    OP_SIDEBAR_TOGGLE_VIRTUAL,         NULL },
+  { "sidebar-toggle-visible",    OP_SIDEBAR_TOGGLE_VISIBLE,         NULL },
 #endif
 
 #ifdef USE_NOTMUCH
-  { "change-vfolder",          OP_MAIN_CHANGE_VFOLDER,         NULL },
-  { "vfolder-from-query",      OP_MAIN_VFOLDER_FROM_QUERY,     NULL },
-  { "vfolder-window-backward", OP_MAIN_WINDOWED_VFOLDER_BACKWARD,   NULL },
-  { "vfolder-window-forward",  OP_MAIN_WINDOWED_VFOLDER_FORWARD,    NULL },
-  { "modify-labels",           OP_MAIN_MODIFY_LABELS,          NULL },
-  { "modify-labels-then-hide", OP_MAIN_MODIFY_LABELS_THEN_HIDE, NULL },
-  { "entire-thread",           OP_MAIN_ENTIRE_THREAD,          NULL },
+  { "change-vfolder",            OP_MAIN_CHANGE_VFOLDER,            NULL },
+  { "vfolder-from-query",        OP_MAIN_VFOLDER_FROM_QUERY,        NULL },
+  { "vfolder-window-backward",   OP_MAIN_WINDOWED_VFOLDER_BACKWARD, NULL },
+  { "vfolder-window-forward",    OP_MAIN_WINDOWED_VFOLDER_FORWARD,  NULL },
+  { "modify-labels",             OP_MAIN_MODIFY_LABELS,             NULL },
+  { "modify-labels-then-hide",   OP_MAIN_MODIFY_LABELS_THEN_HIDE,   NULL },
+  { "entire-thread",             OP_MAIN_ENTIRE_THREAD,             NULL },
 #endif
-  { NULL,                      0,                              NULL }
+  { NULL,                        0,                                 NULL }
 };
 
 const struct binding_t OpPager[] = { /* map: pager */
-  { "break-thread",    OP_MAIN_BREAK_THREAD,           "#" },
-  { "create-alias",    OP_CREATE_ALIAS,                "a" },
-  { "bounce-message",  OP_BOUNCE_MESSAGE,              "b" },
-  { "change-folder",   OP_MAIN_CHANGE_FOLDER,          "c" },
-  { "change-folder-readonly",  OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" },
+  { "break-thread",              OP_MAIN_BREAK_THREAD,            "#" },
+  { "create-alias",              OP_CREATE_ALIAS,                 "a" },
+  { "bounce-message",            OP_BOUNCE_MESSAGE,               "b" },
+  { "change-folder",             OP_MAIN_CHANGE_FOLDER,           "c" },
+  { "change-folder-readonly",    OP_MAIN_CHANGE_FOLDER_READONLY,  "\033c" },
 #ifdef USE_NNTP
-  { "change-newsgroup",                OP_MAIN_CHANGE_GROUP,           NULL },
-  { "change-newsgroup-readonly",OP_MAIN_CHANGE_GROUP_READONLY, NULL },
+  { "change-newsgroup",          OP_MAIN_CHANGE_GROUP,            NULL },
+  { "change-newsgroup-readonly", OP_MAIN_CHANGE_GROUP_READONLY,   NULL },
 #endif
-  { "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" },
-  { "delete-thread",   OP_DELETE_THREAD,               "\004" },
-  { "delete-subthread",        OP_DELETE_SUBTHREAD,            "\033d" },
-  { "set-flag",        OP_MAIN_SET_FLAG,               "w" },
-  { "clear-flag",       OP_MAIN_CLEAR_FLAG,            "W" },
-  { "edit",            OP_EDIT_MESSAGE,                "e" },
-  { "edit-label",      OP_EDIT_LABEL,                  "Y" },
-  { "edit-type",       OP_EDIT_TYPE,                   "\005" },
+  { "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" },
+  { "delete-thread",             OP_DELETE_THREAD,                "\004" },
+  { "delete-subthread",          OP_DELETE_SUBTHREAD,             "\033d" },
+  { "set-flag",                  OP_MAIN_SET_FLAG,                "w" },
+  { "clear-flag",                OP_MAIN_CLEAR_FLAG,              "W" },
+  { "edit",                      OP_EDIT_MESSAGE,                 "e" },
+  { "edit-label",                OP_EDIT_LABEL,                   "Y" },
+  { "edit-type",                 OP_EDIT_TYPE,                    "\005" },
 #ifdef USE_NNTP
-  { "followup-message",        OP_FOLLOWUP,                    NULL },
-  { "forward-to-group",        OP_FORWARD_TO_GROUP,            NULL },
+  { "followup-message",          OP_FOLLOWUP,                     NULL },
+  { "forward-to-group",          OP_FORWARD_TO_GROUP,             NULL },
 #endif
-  { "forward-message", OP_FORWARD_MESSAGE,             "f" },
-  { "flag-message",    OP_FLAG_MESSAGE,                "F" },
-  { "group-reply",     OP_GROUP_REPLY,                 "g" },
+  { "forward-message",           OP_FORWARD_MESSAGE,              "f" },
+  { "flag-message",              OP_FLAG_MESSAGE,                 "F" },
+  { "group-reply",               OP_GROUP_REPLY,                  "g" },
 #ifdef USE_IMAP
-  { "imap-fetch-mail",  OP_MAIN_IMAP_FETCH,            NULL },
-  { "imap-logout-all",  OP_MAIN_IMAP_LOGOUT_ALL,       NULL },
+  { "imap-fetch-mail",           OP_MAIN_IMAP_FETCH,              NULL },
+  { "imap-logout-all",           OP_MAIN_IMAP_LOGOUT_ALL,         NULL },
 #endif
-  { "display-toggle-weed",     OP_DISPLAY_HEADERS,             "h" },
-  { "next-undeleted",  OP_MAIN_NEXT_UNDELETED,         "j" },
-  { "next-entry",      OP_NEXT_ENTRY,                  "J" },
-  { "previous-undeleted",OP_MAIN_PREV_UNDELETED,       "k" },
-  { "previous-entry",  OP_PREV_ENTRY,                  "K" },
-  { "link-threads",    OP_MAIN_LINK_THREADS,           "&" },
-  { "list-reply",      OP_LIST_REPLY,                  "L" },
-  { "redraw-screen",   OP_REDRAW,                      "\014" },
-  { "mail",            OP_MAIL,                        "m" },
-  { "mark-as-new",     OP_TOGGLE_NEW,                  "N" },
-  { "search-next",     OP_SEARCH_NEXT,                 "n" },
-  { "next-thread",     OP_MAIN_NEXT_THREAD,            "\016" },
-  { "next-subthread",  OP_MAIN_NEXT_SUBTHREAD,         "\033n" },
-  { "sort-mailbox",    OP_SORT,                        "o" },
-  { "sort-reverse",    OP_SORT_REVERSE,                "O" },
-  { "print-message",   OP_PRINT,                       "p" },
+  { "display-toggle-weed",       OP_DISPLAY_HEADERS,              "h" },
+  { "next-undeleted",            OP_MAIN_NEXT_UNDELETED,          "j" },
+  { "next-entry",                OP_NEXT_ENTRY,                   "J" },
+  { "previous-undeleted",        OP_MAIN_PREV_UNDELETED,          "k" },
+  { "previous-entry",            OP_PREV_ENTRY,                   "K" },
+  { "link-threads",              OP_MAIN_LINK_THREADS,            "&" },
+  { "list-reply",                OP_LIST_REPLY,                   "L" },
+  { "redraw-screen",             OP_REDRAW,                       "\014" },
+  { "mail",                      OP_MAIL,                         "m" },
+  { "mark-as-new",               OP_TOGGLE_NEW,                   "N" },
+  { "search-next",               OP_SEARCH_NEXT,                  "n" },
+  { "next-thread",               OP_MAIN_NEXT_THREAD,             "\016" },
+  { "next-subthread",            OP_MAIN_NEXT_SUBTHREAD,          "\033n" },
+  { "sort-mailbox",              OP_SORT,                         "o" },
+  { "sort-reverse",              OP_SORT_REVERSE,                 "O" },
+  { "print-message",             OP_PRINT,                        "p" },
 #ifdef USE_NNTP
-  { "post-message",    OP_POST,                        NULL },
+  { "post-message",              OP_POST,                         NULL },
 #endif
-  { "previous-thread", OP_MAIN_PREV_THREAD,            "\020" },
-  { "previous-subthread",OP_MAIN_PREV_SUBTHREAD,       "\033p" },
-  { "purge-message",   OP_PURGE_MESSAGE,               NULL },
-  { "purge-thread",    OP_PURGE_THREAD,                NULL },
-  { "quit",            OP_QUIT,                        "Q" },
-  { "exit",            OP_EXIT,                        "q" },
-  { "reply",           OP_REPLY,                       "r" },
-  { "recall-message",  OP_RECALL_MESSAGE,              "R" },
+  { "previous-thread",           OP_MAIN_PREV_THREAD,             "\020" },
+  { "previous-subthread",        OP_MAIN_PREV_SUBTHREAD,          "\033p" },
+  { "purge-message",             OP_PURGE_MESSAGE,                NULL },
+  { "purge-thread",              OP_PURGE_THREAD,                 NULL },
+  { "quit",                      OP_QUIT,                         "Q" },
+  { "exit",                      OP_EXIT,                         "q" },
+  { "reply",                     OP_REPLY,                        "r" },
+  { "recall-message",            OP_RECALL_MESSAGE,               "R" },
 #ifdef USE_NNTP
-  { "reconstruct-thread",      OP_RECONSTRUCT_THREAD,  NULL },
+  { "reconstruct-thread",        OP_RECONSTRUCT_THREAD,           NULL },
 #endif
-  { "read-thread",     OP_MAIN_READ_THREAD,            "\022" },
-  { "read-subthread",  OP_MAIN_READ_SUBTHREAD,         "\033r" },
-  { "resend-message",  OP_RESEND,                      "\033e" },
-  { "compose-to-sender",OP_COMPOSE_TO_SENDER,          NULL },
-  { "save-message",    OP_SAVE,                        "s" },
-  { "skip-quoted",     OP_PAGER_SKIP_QUOTED,           "S" },
-  { "decode-save",     OP_DECODE_SAVE,                 "\033s" },
-  { "tag-message",     OP_TAG,                         "t" },
-  { "toggle-quoted",   OP_PAGER_HIDE_QUOTED,           "T" },
-  { "undelete-message",        OP_UNDELETE,                    "u" },
-  { "undelete-subthread",OP_UNDELETE_SUBTHREAD,                "\033u" },
-  { "undelete-thread", OP_UNDELETE_THREAD,             "\025" },
-  { "view-attachments",        OP_VIEW_ATTACHMENTS,            "v" },
-  { "show-version",    OP_VERSION,                     "V" },
-  { "search-toggle",   OP_SEARCH_TOGGLE,               "\\" },
-  { "display-address", OP_DISPLAY_ADDRESS,             "@" },
-  { "next-new",                OP_MAIN_NEXT_NEW,               NULL },
-  { "next-new-then-unread", 
-                        OP_MAIN_NEXT_NEW_THEN_UNREAD,   "\t" },
-  { "pipe-message",    OP_PIPE,                        "|" },
-  { "help",            OP_HELP,                        "?" },
-  { "next-page",       OP_NEXT_PAGE,                   " " },
-  { "previous-page",   OP_PREV_PAGE,                   "-" },
-  { "top",             OP_PAGER_TOP,                   "^" },
-  { "sync-mailbox",    OP_MAIN_SYNC_FOLDER,            "$" },
-  { "shell-escape",    OP_SHELL_ESCAPE,                "!" },
-  { "enter-command",   OP_ENTER_COMMAND,               ":" },
-  { "buffy-list",      OP_BUFFY_LIST,                  "." },
-  { "search",          OP_SEARCH,                      "/" },
-  { "search-reverse",  OP_SEARCH_REVERSE,              "\033/" },
-  { "search-opposite", OP_SEARCH_OPPOSITE,             NULL },
-  { "next-line",       OP_NEXT_LINE,                   "\n" },
-  { "next-line",       OP_NEXT_LINE,                   "\r" },
-  { "jump",            OP_JUMP,                        NULL },
-  { "next-unread",     OP_MAIN_NEXT_UNREAD,            NULL },
-  { "previous-new",    OP_MAIN_PREV_NEW,               NULL },
-  { "previous-new-then-unread",
-                       OP_MAIN_PREV_NEW_THEN_UNREAD,   NULL },
-  { "previous-unread", OP_MAIN_PREV_UNREAD,            NULL },
-  { "half-up",         OP_HALF_UP,                     NULL },
-  { "half-down",       OP_HALF_DOWN,                   NULL },
-  { "previous-line",   OP_PREV_LINE,                   NULL },
-  { "bottom",          OP_PAGER_BOTTOM,                NULL },
-  { "parent-message",  OP_MAIN_PARENT_MESSAGE,         "P" },
-  { "root-message",    OP_MAIN_ROOT_MESSAGE,           NULL },
-
-
-
-
-  { "check-traditional-pgp",   OP_CHECK_TRADITIONAL,   "\033P"   },
-  { "mail-key",                OP_MAIL_KEY,                    "\033k" },
-  { "extract-keys",    OP_EXTRACT_KEYS,                "\013" },
-  { "forget-passphrase",OP_FORGET_PASSPHRASE,          "\006" },
-  { "decrypt-copy",    OP_DECRYPT_COPY,                NULL },
-  { "decrypt-save",            OP_DECRYPT_SAVE,                NULL },
-
-  { "what-key",                OP_WHAT_KEY,            NULL },
-  { "quasi-delete",    OP_MAIN_QUASI_DELETE,           NULL },
+  { "read-thread",               OP_MAIN_READ_THREAD,             "\022" },
+  { "read-subthread",            OP_MAIN_READ_SUBTHREAD,          "\033r" },
+  { "resend-message",            OP_RESEND,                       "\033e" },
+  { "compose-to-sender",         OP_COMPOSE_TO_SENDER,            NULL },
+  { "save-message",              OP_SAVE,                         "s" },
+  { "skip-quoted",               OP_PAGER_SKIP_QUOTED,            "S" },
+  { "decode-save",               OP_DECODE_SAVE,                  "\033s" },
+  { "tag-message",               OP_TAG,                          "t" },
+  { "toggle-quoted",             OP_PAGER_HIDE_QUOTED,            "T" },
+  { "undelete-message",          OP_UNDELETE,                     "u" },
+  { "undelete-subthread",        OP_UNDELETE_SUBTHREAD,           "\033u" },
+  { "undelete-thread",           OP_UNDELETE_THREAD,              "\025" },
+  { "view-attachments",          OP_VIEW_ATTACHMENTS,             "v" },
+  { "show-version",              OP_VERSION,                      "V" },
+  { "search-toggle",             OP_SEARCH_TOGGLE,                "\\" },
+  { "display-address",           OP_DISPLAY_ADDRESS,              "@" },
+  { "next-new",                  OP_MAIN_NEXT_NEW,                NULL },
+  { "next-new-then-unread",      OP_MAIN_NEXT_NEW_THEN_UNREAD,    "\t" },
+  { "pipe-message",              OP_PIPE,                         "|" },
+  { "help",                      OP_HELP,                         "?" },
+  { "next-page",                 OP_NEXT_PAGE,                    " " },
+  { "previous-page",             OP_PREV_PAGE,                    "-" },
+  { "top",                       OP_PAGER_TOP,                    "^" },
+  { "sync-mailbox",              OP_MAIN_SYNC_FOLDER,             "$" },
+  { "shell-escape",              OP_SHELL_ESCAPE,                 "!" },
+  { "enter-command",             OP_ENTER_COMMAND,                ":" },
+  { "buffy-list",                OP_BUFFY_LIST,                   "." },
+  { "search",                    OP_SEARCH,                       "/" },
+  { "search-reverse",            OP_SEARCH_REVERSE,               "\033/" },
+  { "search-opposite",           OP_SEARCH_OPPOSITE,              NULL },
+  { "next-line",                 OP_NEXT_LINE,                    "\n" },
+  { "next-line",                 OP_NEXT_LINE,                    "\r" },
+  { "jump",                      OP_JUMP,                         NULL },
+  { "next-unread",               OP_MAIN_NEXT_UNREAD,             NULL },
+  { "previous-new",              OP_MAIN_PREV_NEW,                NULL },
+  { "previous-new-then-unread",  OP_MAIN_PREV_NEW_THEN_UNREAD,    NULL },
+  { "previous-unread",           OP_MAIN_PREV_UNREAD,             NULL },
+  { "half-up",                   OP_HALF_UP,                      NULL },
+  { "half-down",                 OP_HALF_DOWN,                    NULL },
+  { "previous-line",             OP_PREV_LINE,                    NULL },
+  { "bottom",                    OP_PAGER_BOTTOM,                 NULL },
+  { "parent-message",            OP_MAIN_PARENT_MESSAGE,          "P" },
+  { "root-message",              OP_MAIN_ROOT_MESSAGE,            NULL },
+  { "check-traditional-pgp",     OP_CHECK_TRADITIONAL,            "\033P"   },
+  { "mail-key",                  OP_MAIL_KEY,                     "\033k" },
+  { "extract-keys",              OP_EXTRACT_KEYS,                 "\013" },
+  { "forget-passphrase",         OP_FORGET_PASSPHRASE,            "\006" },
+  { "decrypt-copy",              OP_DECRYPT_COPY,                 NULL },
+  { "decrypt-save",              OP_DECRYPT_SAVE,                 NULL },
+
+  { "what-key",                  OP_WHAT_KEY,                     NULL },
+  { "quasi-delete",              OP_MAIN_QUASI_DELETE,            NULL },
 
 #ifdef USE_SIDEBAR
-  { "sidebar-next",            OP_SIDEBAR_NEXT,                NULL },
-  { "sidebar-next-new",                OP_SIDEBAR_NEXT_NEW,            NULL },
-  { "sidebar-open",            OP_SIDEBAR_OPEN,                NULL },
-  { "sidebar-page-down",       OP_SIDEBAR_PAGE_DOWN,           NULL },
-  { "sidebar-page-up",         OP_SIDEBAR_PAGE_UP,             NULL },
-  { "sidebar-prev",            OP_SIDEBAR_PREV,                NULL },
-  { "sidebar-prev-new",                OP_SIDEBAR_PREV_NEW,            NULL },
-  { "sidebar-toggle-virtual",  OP_SIDEBAR_TOGGLE_VIRTUAL,      NULL },
-  { "sidebar-toggle-visible",  OP_SIDEBAR_TOGGLE_VISIBLE,      NULL },
+  { "sidebar-next",              OP_SIDEBAR_NEXT,                 NULL },
+  { "sidebar-next-new",          OP_SIDEBAR_NEXT_NEW,             NULL },
+  { "sidebar-open",              OP_SIDEBAR_OPEN,                 NULL },
+  { "sidebar-page-down",         OP_SIDEBAR_PAGE_DOWN,            NULL },
+  { "sidebar-page-up",           OP_SIDEBAR_PAGE_UP,              NULL },
+  { "sidebar-prev",              OP_SIDEBAR_PREV,                 NULL },
+  { "sidebar-prev-new",          OP_SIDEBAR_PREV_NEW,             NULL },
+  { "sidebar-toggle-virtual",    OP_SIDEBAR_TOGGLE_VIRTUAL,       NULL },
+  { "sidebar-toggle-visible",    OP_SIDEBAR_TOGGLE_VISIBLE,       NULL },
 #endif
 
 #ifdef USE_NOTMUCH
-  { "change-vfolder",          OP_MAIN_CHANGE_VFOLDER,         NULL },
-  { "vfolder-from-query",      OP_MAIN_VFOLDER_FROM_QUERY,     NULL },
-  { "modify-labels",           OP_MAIN_MODIFY_LABELS,          NULL },
-  { "modify-labels-then-hide", OP_MAIN_MODIFY_LABELS_THEN_HIDE, NULL },
-  { "entire-thread",           OP_MAIN_ENTIRE_THREAD,          NULL },
+  { "change-vfolder",            OP_MAIN_CHANGE_VFOLDER,          NULL },
+  { "vfolder-from-query",        OP_MAIN_VFOLDER_FROM_QUERY,      NULL },
+  { "modify-labels",             OP_MAIN_MODIFY_LABELS,           NULL },
+  { "modify-labels-then-hide",   OP_MAIN_MODIFY_LABELS_THEN_HIDE, NULL },
+  { "entire-thread",             OP_MAIN_ENTIRE_THREAD,           NULL },
 #endif
 
-  { NULL,              0,                              NULL }
+  { NULL,                        0,                               NULL }
 };
 
 const struct binding_t OpAttach[] = { /* map: attachment */
-  { "bounce-message",  OP_BOUNCE_MESSAGE,              "b" },
-  { "display-toggle-weed",     OP_DISPLAY_HEADERS,     "h" },
-  { "edit-type",       OP_EDIT_TYPE,                   "\005" },
+  { "bounce-message",        OP_BOUNCE_MESSAGE,              "b" },
+  { "display-toggle-weed",   OP_DISPLAY_HEADERS,             "h" },
+  { "edit-type",             OP_EDIT_TYPE,                   "\005" },
 #ifdef USE_NNTP
-  { "followup-message",        OP_FOLLOWUP,                    NULL },
-  { "forward-to-group",        OP_FORWARD_TO_GROUP,            NULL },
+  { "followup-message",      OP_FOLLOWUP,                    NULL },
+  { "forward-to-group",      OP_FORWARD_TO_GROUP,            NULL },
 #endif
-  { "print-entry",     OP_PRINT,                       "p" },
-  { "save-entry",      OP_SAVE,                        "s" },
-  { "pipe-entry",      OP_PIPE,                        "|" },
-  { "view-mailcap",    OP_ATTACH_VIEW_MAILCAP,         "m" },
-  { "reply",           OP_REPLY,                       "r" },
-  { "resend-message",  OP_RESEND,                      "\033e" },
-  { "group-reply",     OP_GROUP_REPLY,                 "g" },
-  { "list-reply",      OP_LIST_REPLY,                  "L" },
-  { "forward-message", OP_FORWARD_MESSAGE,             "f" },
-  { "view-text",       OP_ATTACH_VIEW_TEXT,            "T" },
-  { "view-attach",     OP_VIEW_ATTACH,                 "\n" },
-  { "view-attach",     OP_VIEW_ATTACH,                 "\r" },
-  { "delete-entry",    OP_DELETE,                      "d" },
-  { "undelete-entry",  OP_UNDELETE,                    "u" },
-  { "collapse-parts",  OP_ATTACH_COLLAPSE,             "v" },
-
-  { "check-traditional-pgp",   OP_CHECK_TRADITIONAL,           "\033P"   },
-  { "extract-keys",            OP_EXTRACT_KEYS,                "\013" },
-  { "forget-passphrase",       OP_FORGET_PASSPHRASE,           "\006" },
-
-  { NULL,              0,                              NULL }
+  { "print-entry",           OP_PRINT,                       "p" },
+  { "save-entry",            OP_SAVE,                        "s" },
+  { "pipe-entry",            OP_PIPE,                        "|" },
+  { "view-mailcap",          OP_ATTACH_VIEW_MAILCAP,         "m" },
+  { "reply",                 OP_REPLY,                       "r" },
+  { "resend-message",        OP_RESEND,                      "\033e" },
+  { "group-reply",           OP_GROUP_REPLY,                 "g" },
+  { "list-reply",            OP_LIST_REPLY,                  "L" },
+  { "forward-message",       OP_FORWARD_MESSAGE,             "f" },
+  { "view-text",             OP_ATTACH_VIEW_TEXT,            "T" },
+  { "view-attach",           OP_VIEW_ATTACH,                 "\n" },
+  { "view-attach",           OP_VIEW_ATTACH,                 "\r" },
+  { "delete-entry",          OP_DELETE,                      "d" },
+  { "undelete-entry",        OP_UNDELETE,                    "u" },
+  { "collapse-parts",        OP_ATTACH_COLLAPSE,             "v" },
+
+  { "check-traditional-pgp", OP_CHECK_TRADITIONAL,           "\033P"   },
+  { "extract-keys",          OP_EXTRACT_KEYS,                "\013" },
+  { "forget-passphrase",     OP_FORGET_PASSPHRASE,           "\006" },
+
+  { NULL,                    0,                              NULL }
 };
 
 const struct binding_t OpCompose[] = { /* map: compose */
-  { "attach-file",     OP_COMPOSE_ATTACH_FILE,         "a" },
-  { "attach-message",  OP_COMPOSE_ATTACH_MESSAGE,      "A" },
+  { "attach-file",           OP_COMPOSE_ATTACH_FILE,         "a" },
+  { "attach-message",        OP_COMPOSE_ATTACH_MESSAGE,      "A" },
 #ifdef USE_NNTP
-  { "attach-news-message",OP_COMPOSE_ATTACH_NEWS_MESSAGE,NULL },
+  { "attach-news-message",   OP_COMPOSE_ATTACH_NEWS_MESSAGE, NULL },
 #endif
-  { "edit-bcc",                OP_COMPOSE_EDIT_BCC,            "b" },
-  { "edit-cc",         OP_COMPOSE_EDIT_CC,             "c" },
-  { "copy-file",       OP_SAVE,                        "C" },
-  { "detach-file",     OP_DELETE,                      "D" },
-  { "toggle-disposition",OP_COMPOSE_TOGGLE_DISPOSITION,        "\004" },
-  { "edit-description",        OP_COMPOSE_EDIT_DESCRIPTION,    "d" },
-  { "edit-message",    OP_COMPOSE_EDIT_MESSAGE,        "e" },
-  { "edit-headers",    OP_COMPOSE_EDIT_HEADERS,        "E" },
-  { "edit-file",       OP_COMPOSE_EDIT_FILE,           "\030e" },
-  { "edit-encoding",   OP_COMPOSE_EDIT_ENCODING,       "\005" },
-  { "edit-from",       OP_COMPOSE_EDIT_FROM,           "\033f" },
-  { "edit-fcc",                OP_COMPOSE_EDIT_FCC,            "f" },
-  { "filter-entry",    OP_FILTER,                      "F" },
-  { "get-attachment",  OP_COMPOSE_GET_ATTACHMENT,      "G" },
-  { "display-toggle-weed",     OP_DISPLAY_HEADERS,             "h" },
-  { "ispell",          OP_COMPOSE_ISPELL,              "i" },
-  { "print-entry",     OP_PRINT,                       "l" },
-  { "edit-mime",       OP_COMPOSE_EDIT_MIME,           "m" },
-  { "new-mime",                OP_COMPOSE_NEW_MIME,            "n" },
+  { "edit-bcc",              OP_COMPOSE_EDIT_BCC,            "b" },
+  { "edit-cc",               OP_COMPOSE_EDIT_CC,             "c" },
+  { "copy-file",             OP_SAVE,                        "C" },
+  { "detach-file",           OP_DELETE,                      "D" },
+  { "toggle-disposition",    OP_COMPOSE_TOGGLE_DISPOSITION,  "\004" },
+  { "edit-description",      OP_COMPOSE_EDIT_DESCRIPTION,    "d" },
+  { "edit-message",          OP_COMPOSE_EDIT_MESSAGE,        "e" },
+  { "edit-headers",          OP_COMPOSE_EDIT_HEADERS,        "E" },
+  { "edit-file",             OP_COMPOSE_EDIT_FILE,           "\030e" },
+  { "edit-encoding",         OP_COMPOSE_EDIT_ENCODING,       "\005" },
+  { "edit-from",             OP_COMPOSE_EDIT_FROM,           "\033f" },
+  { "edit-fcc",              OP_COMPOSE_EDIT_FCC,            "f" },
+  { "filter-entry",          OP_FILTER,                      "F" },
+  { "get-attachment",        OP_COMPOSE_GET_ATTACHMENT,      "G" },
+  { "display-toggle-weed",   OP_DISPLAY_HEADERS,             "h" },
+  { "ispell",                OP_COMPOSE_ISPELL,              "i" },
+  { "print-entry",           OP_PRINT,                       "l" },
+  { "edit-mime",             OP_COMPOSE_EDIT_MIME,           "m" },
+  { "new-mime",              OP_COMPOSE_NEW_MIME,            "n" },
 #ifdef USE_NNTP
-  { "edit-newsgroups", OP_COMPOSE_EDIT_NEWSGROUPS,     NULL },
-  { "edit-followup-to",        OP_COMPOSE_EDIT_FOLLOWUP_TO,    NULL },
-  { "edit-x-comment-to",OP_COMPOSE_EDIT_X_COMMENT_TO,  NULL },
+  { "edit-newsgroups",       OP_COMPOSE_EDIT_NEWSGROUPS,     NULL },
+  { "edit-followup-to",      OP_COMPOSE_EDIT_FOLLOWUP_TO,    NULL },
+  { "edit-x-comment-to",     OP_COMPOSE_EDIT_X_COMMENT_TO,   NULL },
 #endif
-  { "postpone-message",        OP_COMPOSE_POSTPONE_MESSAGE,    "P" },
-  { "edit-reply-to",   OP_COMPOSE_EDIT_REPLY_TO,       "r" },
-  { "rename-attachment",OP_COMPOSE_RENAME_ATTACHMENT,  "\017" },
-  { "rename-file",     OP_COMPOSE_RENAME_FILE,         "R" },
-  { "edit-subject",    OP_COMPOSE_EDIT_SUBJECT,        "s" },
-  { "edit-to",         OP_COMPOSE_EDIT_TO,             "t" },
-  { "edit-type",       OP_EDIT_TYPE,                   "\024" },
-  { "write-fcc",       OP_COMPOSE_WRITE_MESSAGE,       "w" },
-  { "toggle-unlink",   OP_COMPOSE_TOGGLE_UNLINK,       "u" },
-  { "toggle-recode",    OP_COMPOSE_TOGGLE_RECODE,      NULL },
-  { "update-encoding", OP_COMPOSE_UPDATE_ENCODING,     "U" },
-  { "view-attach",     OP_VIEW_ATTACH,                 "\n" },
-  { "view-attach",     OP_VIEW_ATTACH,                 "\r" },
-  { "send-message",    OP_COMPOSE_SEND_MESSAGE,        "y" },
-  { "pipe-entry",      OP_PIPE,                        "|" },
-
-  { "attach-key",      OP_COMPOSE_ATTACH_KEY,          "\033k" },
-  { "pgp-menu",                OP_COMPOSE_PGP_MENU,            "p"     },
-
-  { "forget-passphrase",OP_FORGET_PASSPHRASE,          "\006"  },
-
-  { "smime-menu",      OP_COMPOSE_SMIME_MENU,          "S"     },
+  { "postpone-message",      OP_COMPOSE_POSTPONE_MESSAGE,    "P" },
+  { "edit-reply-to",         OP_COMPOSE_EDIT_REPLY_TO,       "r" },
+  { "rename-attachment",     OP_COMPOSE_RENAME_ATTACHMENT,   "\017" },
+  { "rename-file",           OP_COMPOSE_RENAME_FILE,         "R" },
+  { "edit-subject",          OP_COMPOSE_EDIT_SUBJECT,        "s" },
+  { "edit-to",               OP_COMPOSE_EDIT_TO,             "t" },
+  { "edit-type",             OP_EDIT_TYPE,                   "\024" },
+  { "write-fcc",             OP_COMPOSE_WRITE_MESSAGE,       "w" },
+  { "toggle-unlink",         OP_COMPOSE_TOGGLE_UNLINK,       "u" },
+  { "toggle-recode",         OP_COMPOSE_TOGGLE_RECODE,       NULL },
+  { "update-encoding",       OP_COMPOSE_UPDATE_ENCODING,     "U" },
+  { "view-attach",           OP_VIEW_ATTACH,                 "\n" },
+  { "view-attach",           OP_VIEW_ATTACH,                 "\r" },
+  { "send-message",          OP_COMPOSE_SEND_MESSAGE,        "y" },
+  { "pipe-entry",            OP_PIPE,                        "|" },
+
+  { "attach-key",            OP_COMPOSE_ATTACH_KEY,          "\033k" },
+  { "pgp-menu",              OP_COMPOSE_PGP_MENU,            "p"   },
+
+  { "forget-passphrase",     OP_FORGET_PASSPHRASE,           "\006"  },
+
+  { "smime-menu",            OP_COMPOSE_SMIME_MENU,          "S"   },
 
 #ifdef MIXMASTER
-  { "mix",             OP_COMPOSE_MIX,                 "M" },
+  { "mix",                   OP_COMPOSE_MIX,                 "M" },
 #endif
-  
-  { NULL,              0,                              NULL }
+
+  { NULL,                    0,                              NULL }
 };
 
 const struct binding_t OpPost[] = { /* map: postpone */
-  { "delete-entry",    OP_DELETE,      "d" },
-  { "undelete-entry",  OP_UNDELETE,    "u" },
-  { NULL,              0,              NULL }
+  { "delete-entry",          OP_DELETE,                      "d" },
+  { "undelete-entry",        OP_UNDELETE,                    "u" },
+  { NULL,                    0,                              NULL }
 };
 
 const struct binding_t OpAlias[] = { /* map: alias */
-  { "delete-entry",    OP_DELETE,      "d" },
-  { "undelete-entry",  OP_UNDELETE,    "u" },
-  { NULL,              0,              NULL }
+  { "delete-entry",          OP_DELETE,                      "d" },
+  { "undelete-entry",        OP_UNDELETE,                    "u" },
+  { NULL,                    0,                              NULL }
 };
-  
+
 
 /* The file browser */
 const struct binding_t OpBrowser[] = { /* map: browser */
-  { "change-dir",      OP_CHANGE_DIRECTORY,    "c" },
-  { "display-filename",        OP_BROWSER_TELL,        "@" },
-  { "enter-mask",      OP_ENTER_MASK,          "m" },
-  { "sort",            OP_SORT,                "o" },
-  { "sort-reverse",    OP_SORT_REVERSE,        "O" },
-  { "select-new",      OP_BROWSER_NEW_FILE,    "N" },
-  { "check-new",       OP_CHECK_NEW,           NULL },
-  { "toggle-mailboxes", OP_TOGGLE_MAILBOXES,   "\t" },
+  { "change-dir",            OP_CHANGE_DIRECTORY,            "c" },
+  { "display-filename",      OP_BROWSER_TELL,                "@" },
+  { "enter-mask",            OP_ENTER_MASK,                  "m" },
+  { "sort",                  OP_SORT,                        "o" },
+  { "sort-reverse",          OP_SORT_REVERSE,                "O" },
+  { "select-new",            OP_BROWSER_NEW_FILE,            "N" },
+  { "check-new",             OP_CHECK_NEW,                   NULL },
+  { "toggle-mailboxes",      OP_TOGGLE_MAILBOXES,            "\t" },
 #ifdef USE_NNTP
-  { "reload-active",   OP_LOAD_ACTIVE,         NULL },
-  { "subscribe-pattern", OP_SUBSCRIBE_PATTERN, NULL },
-  { "unsubscribe-pattern", OP_UNSUBSCRIBE_PATTERN, NULL },
-  { "catchup",         OP_CATCHUP,             NULL },
-  { "uncatchup",       OP_UNCATCHUP,           NULL },
+  { "reload-active",         OP_LOAD_ACTIVE,                 NULL },
+  { "subscribe-pattern",     OP_SUBSCRIBE_PATTERN,           NULL },
+  { "unsubscribe-pattern",   OP_UNSUBSCRIBE_PATTERN,         NULL },
+  { "catchup",               OP_CATCHUP,                     NULL },
+  { "uncatchup",             OP_UNCATCHUP,                   NULL },
 #endif
-  { "view-file",       OP_BROWSER_VIEW_FILE,   " " },
-  { "buffy-list",      OP_BUFFY_LIST,          "." },
+  { "view-file",             OP_BROWSER_VIEW_FILE,           " " },
+  { "buffy-list",            OP_BUFFY_LIST,                  "." },
 #ifdef USE_IMAP
-  { "create-mailbox",   OP_CREATE_MAILBOX,      "C" },
-  { "delete-mailbox",   OP_DELETE_MAILBOX,      "d" },
-  { "rename-mailbox",   OP_RENAME_MAILBOX,      "r" },
+  { "create-mailbox",        OP_CREATE_MAILBOX,              "C" },
+  { "delete-mailbox",        OP_DELETE_MAILBOX,              "d" },
+  { "rename-mailbox",        OP_RENAME_MAILBOX,              "r" },
 #endif
 #if defined USE_IMAP || defined USE_NNTP
-  { "subscribe",       OP_BROWSER_SUBSCRIBE,   "s" },
-  { "unsubscribe",     OP_BROWSER_UNSUBSCRIBE, "u" },
+  { "subscribe",             OP_BROWSER_SUBSCRIBE,           "s" },
+  { "unsubscribe",           OP_BROWSER_UNSUBSCRIBE,         "u" },
 #endif
 #ifdef USE_IMAP
-  { "toggle-subscribed", OP_BROWSER_TOGGLE_LSUB, "T" },
+  { "toggle-subscribed",     OP_BROWSER_TOGGLE_LSUB,         "T" },
 #endif
-  { "goto-folder",     OP_BROWSER_GOTO_FOLDER, "=" },
-  { NULL,              0,                      NULL }
+  { "goto-folder",           OP_BROWSER_GOTO_FOLDER,         "=" },
+  { NULL,                    0,                              NULL }
 };
 
 /* External Query Menu */
 const struct binding_t OpQuery[] = { /* map: query */
-  { "create-alias",    OP_CREATE_ALIAS,        "a" },
-  { "mail",            OP_MAIL,                "m" },
-  { "query",           OP_QUERY,               "Q" },
-  { "query-append",    OP_QUERY_APPEND,        "A" },
-  { NULL,              0,                      NULL }
+  { "create-alias",          OP_CREATE_ALIAS,                "a" },
+  { "mail",                  OP_MAIL,                        "m" },
+  { "query",                 OP_QUERY,                       "Q" },
+  { "query-append",          OP_QUERY_APPEND,                "A" },
+  { NULL,                    0,                              NULL }
 };
 
 const struct binding_t OpEditor[] = { /* map: editor */
-  { "bol",             OP_EDITOR_BOL,                  "\001" },
-  { "backward-char",   OP_EDITOR_BACKWARD_CHAR,        "\002" },
-  { "backward-word",   OP_EDITOR_BACKWARD_WORD,        "\033b"},
-  { "capitalize-word", OP_EDITOR_CAPITALIZE_WORD,      "\033c"},
-  { "downcase-word",   OP_EDITOR_DOWNCASE_WORD,        "\033l"},
-  { "upcase-word",     OP_EDITOR_UPCASE_WORD,          "\033u"},
-  { "delete-char",     OP_EDITOR_DELETE_CHAR,          "\004" },
-  { "eol",             OP_EDITOR_EOL,                  "\005" },
-  { "forward-char",    OP_EDITOR_FORWARD_CHAR,         "\006" },
-  { "forward-word",    OP_EDITOR_FORWARD_WORD,         "\033f"},
-  { "backspace",       OP_EDITOR_BACKSPACE,            "\010" },
-  { "kill-eol",                OP_EDITOR_KILL_EOL,             "\013" },
-  { "kill-eow",                OP_EDITOR_KILL_EOW,             "\033d"},
-  { "kill-line",       OP_EDITOR_KILL_LINE,            "\025" },
-  { "quote-char",      OP_EDITOR_QUOTE_CHAR,           "\026" },
-  { "kill-word",       OP_EDITOR_KILL_WORD,            "\027" },
-  { "complete",                OP_EDITOR_COMPLETE,             "\t"   },
-  { "complete-query",  OP_EDITOR_COMPLETE_QUERY,       "\024" },
-  { "buffy-cycle",     OP_EDITOR_BUFFY_CYCLE,          " "    },
-  { "history-up",      OP_EDITOR_HISTORY_UP,           NULL   },
-  { "history-down",    OP_EDITOR_HISTORY_DOWN,         NULL   },
-  { "transpose-chars", OP_EDITOR_TRANSPOSE_CHARS,      NULL   },
-  { NULL,              0,                              NULL   }
+  { "bol",                   OP_EDITOR_BOL,                  "\001" },
+  { "backward-char",         OP_EDITOR_BACKWARD_CHAR,        "\002" },
+  { "backward-word",         OP_EDITOR_BACKWARD_WORD,        "\033b"},
+  { "capitalize-word",       OP_EDITOR_CAPITALIZE_WORD,      "\033c"},
+  { "downcase-word",         OP_EDITOR_DOWNCASE_WORD,        "\033l"},
+  { "upcase-word",           OP_EDITOR_UPCASE_WORD,          "\033u"},
+  { "delete-char",           OP_EDITOR_DELETE_CHAR,          "\004" },
+  { "eol",                   OP_EDITOR_EOL,                  "\005" },
+  { "forward-char",          OP_EDITOR_FORWARD_CHAR,         "\006" },
+  { "forward-word",          OP_EDITOR_FORWARD_WORD,         "\033f"},
+  { "backspace",             OP_EDITOR_BACKSPACE,            "\010" },
+  { "kill-eol",              OP_EDITOR_KILL_EOL,             "\013" },
+  { "kill-eow",              OP_EDITOR_KILL_EOW,             "\033d"},
+  { "kill-line",             OP_EDITOR_KILL_LINE,            "\025" },
+  { "quote-char",            OP_EDITOR_QUOTE_CHAR,           "\026" },
+  { "kill-word",             OP_EDITOR_KILL_WORD,            "\027" },
+  { "complete",              OP_EDITOR_COMPLETE,             "\t"   },
+  { "complete-query",        OP_EDITOR_COMPLETE_QUERY,       "\024" },
+  { "buffy-cycle",           OP_EDITOR_BUFFY_CYCLE,          " "    },
+  { "history-up",            OP_EDITOR_HISTORY_UP,           NULL   },
+  { "history-down",          OP_EDITOR_HISTORY_DOWN,         NULL   },
+  { "transpose-chars",       OP_EDITOR_TRANSPOSE_CHARS,      NULL   },
+  { NULL,                    0,                              NULL   }
 };
 
 
 
 const struct binding_t OpPgp[] = { /* map: pgp */
-  { "verify-key",      OP_VERIFY_KEY,          "c" },
-  { "view-name",       OP_VIEW_ID,             "%" },
-  { NULL,              0,                              NULL }
+  { "verify-key",            OP_VERIFY_KEY,                  "c" },
+  { "view-name",             OP_VIEW_ID,                     "%" },
+  { NULL,                    0,                              NULL }
 };
 
 
@@ -550,23 +544,23 @@ const struct binding_t OpPgp[] = { /* map: pgp */
    for the SMIME menu.  */
 const struct binding_t OpSmime[] = { /* map: smime */
 #ifdef CRYPT_BACKEND_GPGME
-  { "verify-key",    OP_VERIFY_KEY,             "c" },
-  { "view-name",     OP_VIEW_ID,               "%" },
+  { "verify-key",            OP_VERIFY_KEY,                  "c" },
+  { "view-name",             OP_VIEW_ID,                     "%" },
 #endif
-  { NULL,      0,      NULL }
+  { NULL,                    0,                              NULL }
 };
 
 
 
 #ifdef MIXMASTER
 const struct binding_t OpMix[] = { /* map: mixmaster */
-  { "accept",          OP_MIX_USE,     "\n" },
-  { "accept",          OP_MIX_USE,     "\r" },
-  { "append",          OP_MIX_APPEND,  "a"       },
-  { "insert",          OP_MIX_INSERT,  "i"       },
-  { "delete",          OP_MIX_DELETE,  "d"       },
-  { "chain-prev",      OP_MIX_CHAIN_PREV, "<left>" },
-  { "chain-next",      OP_MIX_CHAIN_NEXT, "<right>" },
-  { NULL,              0,              NULL }
+  { "accept",                OP_MIX_USE,                     "\n" },
+  { "accept",                OP_MIX_USE,                     "\r" },
+  { "append",                OP_MIX_APPEND,                  "a"       },
+  { "insert",                OP_MIX_INSERT,                  "i"       },
+  { "delete",                OP_MIX_DELETE,                  "d"   },
+  { "chain-prev",            OP_MIX_CHAIN_PREV,              "<left>" },
+  { "chain-next",            OP_MIX_CHAIN_NEXT,              "<right>" },
+  { NULL,                    0,                              NULL }
 };
 #endif /* MIXMASTER */