From 006229c32e692a5aacbef1f6237b6b076ce1816f Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Mon, 30 Oct 2006 14:13:36 +0000
Subject: 22924: a couple more metafy_line()/unmetafy_line() problems

---
 Src/Zle/compresult.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'Src/Zle/compresult.c')

diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c
index 43dce9276..ebfb2cc47 100644
--- a/Src/Zle/compresult.c
+++ b/Src/Zle/compresult.c
@@ -1225,6 +1225,8 @@ do_menucmp(int lst)
 int
 reverse_menu(UNUSED(Hookdef dummy), UNUSED(void *dummy2))
 {
+    int was_meta;
+
     do {
 	if (minfo.cur == (minfo.group)->matches) {
 	    do {
@@ -1239,9 +1241,16 @@ reverse_menu(UNUSED(Hookdef dummy), UNUSED(void *dummy2))
 	     ((*minfo.cur)->flags & CMF_DUMMY) ||
 	     (((*minfo.cur)->flags & (CMF_NOLIST | CMF_MULT)) &&
 	      (!(*minfo.cur)->str || !*(*minfo.cur)->str)));
-    metafy_line();
+    /* May already be metafied if called from within a selection */
+    if (zlemetaline == NULL) {
+	metafy_line();
+	was_meta = 0;
+    }
+    else
+	was_meta = 1;
     do_single(*(minfo.cur));
-    unmetafy_line();
+    if (!was_meta)
+	unmetafy_line();
 
     return 0;
 }
-- 
cgit 1.4.1