From 751172969018227400968a1bafcb96cd0feb0abc Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Fri, 20 May 2005 19:27:45 +0000
Subject: [PATCH] * edit.h: Eliminate edit_message_dialog macro - it's used
 inconsistently.  Fix all callers to use query_dialog().

---
 edit/ChangeLog  |  5 +++++
 edit/edit.h     |  1 -
 edit/editcmd.c  |  3 ++-
 edit/editmenu.c | 19 ++++++-------------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/edit/ChangeLog b/edit/ChangeLog
index a66e9b27b..99b370a02 100644
--- a/edit/ChangeLog
+++ b/edit/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-20  Pavel Roskin  <proski@gnu.org>
+
+	* edit.h: Eliminate edit_message_dialog macro - it's used
+	inconsistently.  Fix all callers to use query_dialog().
+
 2005-05-10  Pavel Roskin  <proski@gnu.org>
 
 	* edit-widget.h: Revert signedness fixes.  We need unsigned char
diff --git a/edit/edit.h b/edit/edit.h
index c5aca4e7b..319ef9d7c 100644
--- a/edit/edit.h
+++ b/edit/edit.h
@@ -227,7 +227,6 @@ void edit_execute_cmd (WEdit *edit, int command, int char_for_insertion);
 
 #define edit_error_dialog(h,s) query_dialog (h, s, D_ERROR, 1, _("&Dismiss"))
 
-#define edit_message_dialog(h,s) query_dialog (h, s, D_NORMAL, 1, _("&OK"))
 #define edit_query_dialog2(h,t,a,b) query_dialog (h, t, D_NORMAL, 2, a, b)
 #define edit_query_dialog3(h,t,a,b,c) query_dialog (h, t, D_NORMAL, 3, a, b, c)
 
diff --git a/edit/editcmd.c b/edit/editcmd.c
index be1f4780d..cc419b650 100644
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@ -2006,7 +2006,8 @@ edit_replace_cmd (WEdit *edit, int again)
 		message (0, msg, _(" %ld replacements made. "),
 			 times_replaced);
 	    } else
-		edit_message_dialog (msg, _(" Search string not found "));
+		query_dialog (msg, _(" Search string not found "),
+			      D_NORMAL, 1, _("&OK"));
 	    replace_continue = 0;
 	}
     } while (replace_continue);
diff --git a/edit/editmenu.c b/edit/editmenu.c
index 25e13e7d7..efb20a229 100644
--- a/edit/editmenu.c
+++ b/edit/editmenu.c
@@ -48,10 +48,6 @@
 #include "edit-widget.h"
 #include "editcmddef.h"
 
-#undef edit_message_dialog
-#define edit_message_dialog(w,x,y,h,s) query_dialog (h, s, 0, 1, _("&OK"))
-#define CFocus(x)
-
 static void
 menu_cmd (int command)
 {
@@ -67,15 +63,12 @@ static void menu_key (int i)
 static void
 edit_about_cmd (void)
 {
-    edit_message_dialog (wedit->mainid, 20, 20, _(" About "),
-		      _("\n"
-		      "                Cooledit  v3.11.5\n"
-		      "\n"
-		      " Copyright (C) 1996 the Free Software Foundation\n"
-		      "\n"
-		      "       A user friendly text editor written\n"
-		      "           for the Midnight Commander.\n")
-	);
+    query_dialog (_(" About "),
+		  _("\n                Cooledit  v3.11.5\n\n"
+		    " Copyright (C) 1996 the Free Software Foundation\n\n"
+		    "       A user friendly text editor written\n"
+		    "           for the Midnight Commander.\n"), D_NORMAL,
+		  1, _("&OK"));
 }
 
 static void