Index: init.h
===================================================================
RCS file: /home/roessler/cvs/mutt/init.h,v
retrieving revision 3.47
diff -u -r3.47 init.h
--- init.h	13 Apr 2004 08:02:12 -0000	3.47
+++ init.h	27 May 2004 01:59:17 -0000
@@ -2581,6 +2581,13 @@
   ** by \fIyou\fP.  The sixth character is used to indicate when a mail
   ** was sent to a mailing-list you subscribe to (default: L).
   */
+  { "trygeneric",	DT_BOOL, R_NONE, OPTTRYGENERIC, 0 },
+  /*
+  ** .pp
+  ** When set, unbound keys will look for generic bindings.
+  ** When unset, unbound keys will just say "Key is not bound."
+  ** (\fIunbound keys\fP means the keys you did "bind x x noop")
+  */
 #ifdef USE_SOCKET
   { "tunnel",            DT_STR, R_NONE, UL &Tunnel, UL 0 },
   /*
Index: keymap.c
===================================================================
RCS file: /home/roessler/cvs/mutt/keymap.c,v
retrieving revision 3.11
diff -u -r3.11 keymap.c
--- keymap.c	12 Apr 2004 20:02:49 -0000	3.11
+++ keymap.c	27 May 2004 01:59:18 -0000
@@ -443,6 +443,9 @@
     if (LastKey != map->keys[pos])
       return (retry_generic (menu, map->keys, pos, LastKey));
 
+    if ((option (OPTTRYGENERIC)) && (map->op == OP_NULL))
+      return (retry_generic (menu, map->keys, pos, LastKey));
+
     if (++pos == map->len)
     {
 
@@ -657,7 +660,7 @@
   
   if(!(km_expand_key(buf, sizeof(buf), key)))
   {
-    mutt_error _("Key is not bound.");
+    mutt_error _("Key is bound to noop or not bound.");
     return;
   }
 
@@ -665,11 +668,11 @@
   push_string (buf);
   if (km_dokey (menu) != OP_HELP)
   {
-    mutt_error _("Key is not bound.");
+    mutt_error _("Key is bound to noop or not bound.");
     return;
   }
 
-  mutt_error (_("Key is not bound.  Press '%s' for help."), buf);
+  mutt_error (_("Key is bound to noop or not bound.  Press '%s' for help."), buf);
   return;
 }
 
Index: mutt.h
===================================================================
RCS file: /home/roessler/cvs/mutt/mutt.h,v
retrieving revision 3.27
diff -u -r3.27 mutt.h
--- mutt.h	13 Apr 2004 08:02:12 -0000	3.27
+++ mutt.h	27 May 2004 01:59:20 -0000
@@ -414,6 +414,7 @@
   OPTTHOROUGHSRC,
   OPTTHREADRECEIVED,
   OPTTILDE,
+  OPTTRYGENERIC,
   OPTUNCOLLAPSEJUMP,
   OPTUSE8BITMIME,
   OPTUSEDOMAIN,
Index: doc/manual.sgml.head
===================================================================
RCS file: /home/roessler/cvs/mutt/doc/manual.sgml.head,v
retrieving revision 3.29
diff -u -r3.29 manual.sgml.head
--- doc/manual.sgml.head	12 Apr 2004 20:02:49 -0000	3.29
+++ doc/manual.sgml.head	27 May 2004 01:59:37 -0000
@@ -961,7 +961,8 @@
 <em/function/ specifies which action to take when <em/key/ is pressed.
 For a complete list of functions, see the <ref id="functions"
 name="reference">.  The special function <tt/noop/ unbinds the specified key
-sequence.
+sequence. Note that the unbound key does not fall back to generic
+binding if <ref id="trygeneric" name="&dollar;trygeneric"> is unset.
 
 <sect1>Defining aliases for character sets <label id="charset-hook">
 <p>