From: Thomas Roessler <roessler@does-not-exist.org>
Date: Tue, 20 Oct 1998 20:22:58 +0000 (+0000)
Subject: Another macro-function fix from Vikas.
X-Git-Tag: mutt-0-94-14-rel~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3baa6cd855312a91787dbdad94ce7250d9f04f03;p=mutt

Another macro-function fix from Vikas.
---

diff --git a/NEWS b/NEWS
index f3263db0..2e374cee 100644
--- a/NEWS
+++ b/NEWS
@@ -39,7 +39,7 @@ Major changes since 0.93
 
 - You can now edit messages in your mail folders. 
 
-  The function edit-message (default 'e') will make a copy of the
+  The function 'edit' (default 'e') will make a copy of the
   current message and you can edit the message. After editing is
   complete, you are taken to the Compose menu. You can further
   modify the message here or re-send it. Note that the message is
diff --git a/doc/manual.sgml.in b/doc/manual.sgml.in
index e87c3c20..01bb3dde 100644
--- a/doc/manual.sgml.in
+++ b/doc/manual.sgml.in
@@ -332,7 +332,7 @@ id="source" name="source"> the file.
 Toggles the weeding of message header fields specified by <ref id="ignore"
 name="ignore"> commands.
 
-<p><bf/edit-message/<label id="edit-messaage"> (default: e)<newline>
+<p><bf/edit/<label id="edit-messaage"> (default: e)<newline>
 
 This command (available in the ``index'' and ``pager'') allows you to
 edit the current message. Once editing is complete, the <em/Compose/ menu
@@ -4325,7 +4325,7 @@ delete-thread             ^D   delete all messages in thread
 display-address            @   display full address of sender
 display-headers            h   display message with full headers
 display-message          RET   display a message
-edit-message               e   edit the current message
+edit                       e   edit the current message
 exit                       x   exit without saving changes
 extract-keys              ^K   extract PGP public keys
 fetch-mail                 G   retrieve mail from POP server
@@ -4390,7 +4390,7 @@ delete-subthread       ESC d   delete all messages in subthread
 delete-thread             ^D   delete all messages in thread
 display-address            @   display full address of sender
 display-headers            h   display message with full headers
-edit-message               e   edit the current message
+edit                       e   edit the current message
 enter-command              :   enter a muttrc command
 exit                       i   return to the main-menu
 extract-keys              ^K   extract PGP public keys
diff --git a/functions.h b/functions.h
index 4ff127b1..f773b001 100644
--- a/functions.h
+++ b/functions.h
@@ -78,7 +78,7 @@ struct binding_t OpMain[] = {
   { "delete-pattern",		OP_MAIN_DELETE_PATTERN,		"D" },
   { "delete-thread",		OP_DELETE_THREAD,		"\004" },
   { "delete-subthread",		OP_DELETE_SUBTHREAD,		"\033d" },
-  { "edit-message",		OP_EDIT_MESSAGE,		"e" },
+  { "edit",			OP_EDIT_MESSAGE,		"e" },
   { "forward-message",		OP_FORWARD_MESSAGE,		"f" },
   { "flag-message",		OP_FLAG_MESSAGE,		"F" },
   { "group-reply",		OP_GROUP_REPLY,			"g" },
@@ -154,7 +154,7 @@ struct binding_t OpPager[] = {
   { "delete-message",	OP_DELETE,			"d" },
   { "delete-thread",	OP_DELETE_THREAD,		"\004" },
   { "delete-subthread",	OP_DELETE_SUBTHREAD,		"\033d" },
-  { "edit-message",	OP_EDIT_MESSAGE,		"e" },
+  { "edit",		OP_EDIT_MESSAGE,		"e" },
   { "forward-message",	OP_FORWARD_MESSAGE,		"f" },
   { "flag-message",	OP_FLAG_MESSAGE,		"F" },
   { "group-reply",	OP_GROUP_REPLY,			"g" },
diff --git a/keymap.c b/keymap.c
index 42d3d742..a58b699f 100644
--- a/keymap.c
+++ b/keymap.c
@@ -231,7 +231,8 @@ static int get_op (struct binding_t *bindings, const char *start, size_t len)
 
   for (i = 0; bindings[i].name; i++)
   {
-    if (!strncasecmp (start, bindings[i].name, len))
+    if (!strncasecmp (start, bindings[i].name, len) &&   
+	strlen (bindings[i].name) == len)
       return bindings[i].op;
   }