From d12e66fb17c1203d40ad208176a8ad2a47324178 Mon Sep 17 00:00:00 2001 From: Roland Illig Date: Mon, 5 Sep 2005 01:25:34 +0000 Subject: [PATCH] * editcmd.c: Fixed some of the gcc warnings. --- edit/ChangeLog | 4 ++++ edit/editcmd.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/edit/ChangeLog b/edit/ChangeLog index 5f528e164..6ed20c0d9 100644 --- a/edit/ChangeLog +++ b/edit/ChangeLog @@ -1,3 +1,7 @@ +2005-09-05 Roland Illig + + * editcmd.c: Fixed some of the gcc warnings. + 2005-08-19 David Martin * choosesyntax.c (exec_edit_syntax_dialog): Not just mark for diff --git a/edit/editcmd.c b/edit/editcmd.c index fdb8cc4a2..f13ff2825 100644 --- a/edit/editcmd.c +++ b/edit/editcmd.c @@ -2031,9 +2031,10 @@ void edit_search_cmd (WEdit * edit, int again) if (!edit) { g_free (old); - old = 0; + old = NULL; return; } + exp = old ? old : exp; if (again) { /*ctrl-hotkey for search again. */ if (!old) @@ -2392,10 +2393,9 @@ int edit_sort_cmd (WEdit * edit) } edit_save_block (edit, catstrs (home_dir, BLOCK_FILE, (char *) NULL), start_mark, end_mark); - exp = old ? old : ""; - exp = input_dialog (_(" Run Sort "), - _(" Enter sort options (see manpage) separated by whitespace: "), exp); + _(" Enter sort options (see manpage) separated by whitespace: "), + (old != NULL) ? old : ""); if (!exp) return 1;