diff -Pur mutt-1.3.23-base/doc/manual.sgml.head mutt-1.3.23/doc/manual.sgml.head
--- mutt-1.3.23-base/doc/manual.sgml.head	Sun Oct  7 01:43:43 2001
+++ mutt-1.3.23/doc/manual.sgml.head	Fri Oct 12 16:12:31 2001
@@ -941,6 +941,10 @@
 name="reference">.  The special function <tt/noop/ unbinds the specify key
 sequence.
 
+The special command <tt/bind * */ reassigns all of Mutt's default
+bindings.  This can be useful following some <ref id="unbind" name="unbind">
+or <ref id="unmacro" name="unmacro"> commands.
+
 <sect1>Defining aliases for character sets <label id="charset-hook">
 <p>
 Usage: <tt/charset-hook/ <em/alias/ <em/charset/<newline>
@@ -1500,6 +1504,26 @@
 considered to be an executable program from which to read input (eg.
 <tt/source ~/bin/myscript|/).
 
+<sect1>Removing key bindings<label id="unbind">
+<p>
+Usage: <tt/unbind/ &lsqb; menu-name | * &rsqb; &lsqb; keysym &rsqb;
+
+This command removes one or all key bindings from one or all menus.
+Either <em/menu-name/ or <em/keysym/, or both, may be the ``wild card''
+character, ``*''.
+If neither is wild, <tt/unbind/ acts the same as <em/bind/ with the <tt/noop/
+function.  If <em/menu-name/ is wild, <em/keysym/ is unbound from all menus.
+If <em/keysym/ is wild, all bindings are removed from <em/menu-name/.
+<tt/unbind * */ removes all key bindings from all contexts.
+
+To prevent you from hanging yourself, <tt/unbind/ will always push the
+<tt/enter-command/ function back onto the Generic bindings table,,
+bound to the ``:'' key.)  A set of basic Editor bindings is also added
+so that the <tt/enter-command/ prompt is actually usable.
+
+The <tt/bind * */ command will reload default bindings, but it does not
+re-parse any Muttrc files.
+
 <sect1>Removing hooks<label id="unhook">
 <p>
 Usage: <tt/unhook/ &lsqb; * | <em/hook-type/ &rsqb;
@@ -1508,6 +1532,13 @@
 You can either remove all hooks by giving the ``*'' character as an
 argument, or you can remove all hooks of a specific type by saying
 something like <tt/unhook send-hook/.
+
+<sect1>Removing macros<label id="unmacro">
+<p>
+Usage: <tt/unmacro/ &lsqb; menu-name | * &rsqb; &lsqb; keysym &rsqb;
+
+<tt/unmacro/ is identical to <tt/unbind/, except that <tt/unbind/ operates
+only on single-key bindings, and <tt/unmacro/ operates only on macros.
 
 <sect>Advanced Usage
 
diff -Pur mutt-1.3.23-base/doc/muttrc.man mutt-1.3.23/doc/muttrc.man
--- mutt-1.3.23-base/doc/muttrc.man	Tue Oct  9 03:44:20 2001
+++ mutt-1.3.23/doc/muttrc.man	Fri Oct 12 16:12:31 2001
@@ -1768,6 +1768,30 @@
 
 
 .TP
+.B mark_macro_prefix
+.nf
+Type: string
+Default: \(lq'\(rq
+.fi
+.IP
+Prefix for macros created using mark-message.  A new macro
+automatically generated with \fI<mark-message>a\fP will be composed
+from this prefix and the letter \fIa\fP.
+
+
+.TP
+.B mark_macro_prefix
+.nf
+Type: string
+Default: \(lq'\(rq
+.fi
+.IP
+Prefix for macros created using mark-message.  A new macro
+automatically generated with \fI<mark-message>a\fP will be composed
+from this prefix and the letter \fIa\fP.
+
+
+.TP
 .B mark_old
 .nf
 Type: boolean
diff -Pur mutt-1.3.23-base/doc/muttrc.man.head mutt-1.3.23/doc/muttrc.man.head
--- mutt-1.3.23-base/doc/muttrc.man.head	Thu Aug 30 15:28:35 2001
+++ mutt-1.3.23/doc/muttrc.man.head	Fri Oct 12 16:12:31 2001
@@ -91,8 +91,12 @@
 .B copiousoutput
 flag set.  A subtype of \(lq\fB*\fP\(rq 
 matches any subtype, as does an empty subtype.
-.TP
+.PP
+.nf
 \fBbind\fP \fImap\fP \fIkey\fP \fIfunction\fP
+\fBunbind\fP [ \fB*\fP | \fImenu-name\fP ] [ \fB*\fP | \fIkey\fP ]
+.fi
+.IP
 This command binds the given \fIkey\fP for the given \fImap\fP to
 the given \fIfunction\fP.
 .IP
@@ -105,6 +109,16 @@
 .IP
 For more information on keys and functions, please consult the Mutt
 Manual.
+.IP
+The \fBunbind\fP command removes key bindings.  When neither
+\fImenu-name\fP nor \fIkey\fP is \(lq\fB*\fP\(rq, \fBunbind\fP is
+identical to \fIbind menu-name key noop\fP.  \(lqWildcarding\(rq either
+parameter will unbind a key from all menus, unbind all keys from a
+given menu, or unbind all keys from all menus.
+.IP
+To prevent irreversible damage, \fBunbind\fP will always ensure that
+the \fBenter-command\fP function is bound.  \(lq\fBbind * *\fP\(rq will
+reload all default bindings.
 .TP
 \fBaccount-hook\fP [\fB!\fP]\fIregexp\fP \fIcommand\fP
 This hook is executed whenever you access a remote mailbox. Useful
@@ -143,10 +157,18 @@
 .IP
 When several \fBfolder-hook\fPs match a given mail folder, they are
 executed in the order given in the configuration file.
-.TP
+.PP
+.nf
 \fBmacro\fP \fImap\fP \fIkey\fP \fIsequence\fP [ \fIdescription\fP ]
-This command binds the given \fIsequence\fP of keys to the given
+\fBunmacro\fP [ \fB*\fP | \fImenu-name\fP ] [ \fB*\fP | \fIkey(s)\fP ]
+.fi
+.IP
+The \fBmacro\fP command binds the given \fIsequence\fP of keys to the given
 \fIkey\fP in the given \fImap\fP.  For valid maps, see \fBbind\fP.
+.IP
+\fBunmacro\fP is identical to \fBunbind\fP, except that \fBunbind works
+only for single key bindings, and \fBunmacro\fP works only on macro
+definitions.
 .PP
 .nf
 \fBcolor\fP \fIobject\fP \fIforeground\fP \fIbackground\fP [ \fI regexp\fP ]
@@ -291,7 +313,7 @@
 default answer of \(lqno.\(rq
 .IP
 The \fBreset\fP command resets all given variables to the compile
-time defaults.  If you reset the special variabe \fBall\fP, all
+time defaults.  If you reset the special variable \fBall\fP, all
 variables will reset to their system defaults.
 .TP
 \fBsource\fP \fIfilename\fP
diff -Pur mutt-1.3.23-base/init.h mutt-1.3.23/init.h
--- mutt-1.3.23-base/init.h	Tue Sep 11 05:38:00 2001
+++ mutt-1.3.23/init.h	Fri Oct 12 16:12:31 2001
@@ -2420,10 +2420,12 @@
   { "subscribe",	parse_subscribe,	0 },
   { "toggle",		parse_set,		M_SET_INV },
   { "unalias",		parse_unalias,		0 },
+  { "unbind",		mutt_parse_unbind,	M_UNBIND },
   { "unhdr_order",	parse_unlist,		UL &HeaderOrderList },
   { "unhook",		mutt_parse_unhook,	0 },
   { "unignore",		parse_unignore,		0 },
   { "unlists",		parse_unlists,		0 },
+  { "unmacro",		mutt_parse_unbind,	M_UNMACRO },
   { "unmono",		mutt_parse_unmono,	0 },
   { "unmy_hdr",		parse_unmy_hdr,		0 },
   { "unscore",		mutt_parse_unscore,	0 },
diff -Pur mutt-1.3.23-base/keymap.c mutt-1.3.23/keymap.c
--- mutt-1.3.23-base/keymap.c	Tue Sep 11 05:50:00 2001
+++ mutt-1.3.23/keymap.c	Fri Oct 12 16:12:31 2001
@@ -50,6 +50,7 @@
 
  { "query",	MENU_QUERY },
  { "generic",	MENU_GENERIC },
+ { "*",		MENU_ALL },
  { NULL,	0 }
 };
 
@@ -665,7 +666,7 @@
 }
 
 /* expects to see: <menu-string> <key-string> */
-char *parse_keymap (int *menu, BUFFER *s, BUFFER *err)
+char *parse_keymap (int *menu, BUFFER *s, BUFFER *err, int wantmore)
 {
   BUFFER buf;
 
@@ -673,6 +674,7 @@
 
   /* menu name */
   mutt_extract_token (&buf, s, 0);
+
   if (MoreArgs (s))
   {
     if ((*menu = mutt_check_menu (buf.data)) == -1)
@@ -688,7 +690,7 @@
       {
 	strfcpy (err->data, _("null key sequence"), err->dsize);
       }
-      else if (MoreArgs (s))
+      else if (!wantmore || MoreArgs (s))
 	return (buf.data);
     }
   }
@@ -761,9 +763,20 @@
   char *key;
   int menu, r = 0;
 
-  if ((key = parse_keymap (&menu, s, err)) == NULL)
+  if ((key = parse_keymap (&menu, s, err, FALSE)) == NULL)
     return (-1);
 
+  if (!MoreArgs(s))
+  {
+    if (menu != MENU_ALL || mutt_strcmp(key, "*") != 0)
+    {
+      strfcpy (err->data, _("too few arguments"), err->dsize);
+      return -1;
+    }
+    km_init();
+    return 0;
+  }
+
   /* function to execute */
   mutt_extract_token (buf, s, 0);
   if (MoreArgs (s))
@@ -792,6 +805,99 @@
   return (r);
 }
 
+static void km_unbind_all(struct keymap_t **map, unsigned long mode)
+{
+  struct keymap_t *cur, *next, *first, *last;
+
+  first = last = NULL;
+  cur = *map;
+
+  while (cur != NULL)
+  {
+    next = cur->next;
+    if ((mode & M_UNBIND && cur->macro == NULL) ||
+        (mode & M_UNMACRO && cur->macro != NULL))
+    {
+      FREE(&cur->macro);
+      FREE(&cur->keys);
+      FREE(&cur->descr);
+      FREE(&cur);
+    }
+    else if (first == NULL)
+    {
+      first = last = cur;
+    }
+    else if (last != NULL)
+    {
+      last->next = cur;
+      last = cur;
+    }
+    else
+    {
+      last = cur;
+    }
+    cur = next;
+  }
+
+  if (last != NULL)
+    last->next = NULL;
+
+  *map = first;
+}
+
+/* unbind menu-name '<key_sequence>' */
+/* Never unbind *everything*.  Leave an escape hatch. */
+int mutt_parse_unbind (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
+{
+  char *key;
+  int menu, i, r = 0;
+
+  if ((key = parse_keymap (&menu, s, err, FALSE)) == NULL)
+    return (-1);
+
+  if (MoreArgs (s))
+  {
+    strfcpy (err->data, _("unbind: too many arguments"), err->dsize);
+    free(&key);
+    return (-1);
+  }
+
+  if (menu == MENU_ALL && mutt_strcmp(key, "*") == 0)
+  {
+    /* Unbind all in each menu */
+    for (i = 0; i < MENU_MAX; ++i)
+      km_unbind_all (&Keymaps[i], data);
+    if ((data & M_UNBIND) == M_UNBIND)
+      km_bindkey (":", MENU_GENERIC, OP_ENTER_COMMAND);
+  }
+  else if (mutt_strcmp(key, "*") == 0)
+  {
+    km_unbind_all (&Keymaps[menu], data);
+    if ((data & M_UNBIND) == M_UNBIND && menu == MENU_GENERIC)
+      km_bindkey (":", MENU_GENERIC, OP_ENTER_COMMAND);
+  }
+  else if (menu == MENU_ALL)
+  {
+    /* Unbind designated key in each menu. */
+    for (i = 0; i < MENU_MAX; ++i)
+      km_bindkey (key, i, OP_NULL);
+    if (!(data & M_UNBIND))
+      km_bindkey (":", MENU_GENERIC, OP_ENTER_COMMAND);
+  }
+  else
+  {
+    /* Just the one. */
+    km_bindkey (key, menu, OP_NULL);
+  }
+
+  /* The enter-command command will need basic editor mappings. */
+  if (menu == MENU_EDITOR || menu == MENU_ALL)
+    create_bindings (OpEditor, MENU_EDITOR);
+
+  FREE (&key);
+  return (r);
+}
+
 /* macro <menu> <key> <macro> <description> */
 int mutt_parse_macro (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
 {
@@ -799,7 +905,7 @@
   char *seq = NULL;
   char *key;
 
-  if ((key = parse_keymap (&menu, s, err)) == NULL)
+  if ((key = parse_keymap (&menu, s, err, TRUE)) == NULL)
     return (-1);
 
   mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
diff -Pur mutt-1.3.23-base/keymap.h mutt-1.3.23/keymap.h
--- mutt-1.3.23-base/keymap.h	Tue Sep 11 05:50:12 2001
+++ mutt-1.3.23/keymap.h	Fri Oct 12 16:12:31 2001
@@ -71,7 +71,8 @@
 
 
 
-  MENU_MAX
+  MENU_MAX,
+  MENU_ALL
 };
 
 /* the keymap trees (one for each menu) */
diff -Pur mutt-1.3.23-base/mutt.h mutt-1.3.23/mutt.h
--- mutt-1.3.23-base/mutt.h	Wed Sep 26 05:15:51 2001
+++ mutt-1.3.23/mutt.h	Fri Oct 12 16:12:31 2001
@@ -787,6 +787,10 @@
 void state_prefix_putc(char, STATE *);
 int  state_printf(STATE *, const char *, ...);
 
+/* Options for mutt_parse_unbind */
+#define M_UNBIND      1<<0
+#define M_UNMACRO     1<<1
+
 #include "ascii.h"
 #include "protos.h"
 #include "lib.h"
diff -Pur mutt-1.3.23-base/protos.h mutt-1.3.23/protos.h
--- mutt-1.3.23-base/protos.h	Tue Jul  3 14:31:16 2001
+++ mutt-1.3.23/protos.h	Fri Oct 12 16:12:31 2001
@@ -286,6 +286,7 @@
 int mutt_needs_mailcap (BODY *);
 int mutt_num_postponed (int);
 int mutt_parse_bind (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+int mutt_parse_unbind (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_exec (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_color (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_uncolor (BUFFER *, BUFFER *, unsigned long, BUFFER *);