* edit.c (user_menu): Don't use catstrs anymore.

edit/ChangeLog

@@ -2,9 +2,9 @@
 
 	* edit.h (catstrs): Changed the return type to "const char *".
 	* editcmd.c (catstrs): Likewise.
-	* edit.c (user_menu): Added const qualifiers.
+	* editcmd.c: Added const qualifiers.
-	* editcmd.c: Likewise.
 	* syntax.c: Don't use catstrs anymore.
+	* edit.c (user_menu): Likewise.
 
 2005-02-07  Roland Illig  <roland.illig@gmx.de>
 

edit/edit.c

@@ -2641,7 +2641,7 @@ user_menu (WEdit * edit)
     int nomark;
     struct stat status;
     long start_mark, end_mark;
-    const char *block_file = catstrs (home_dir, BLOCK_FILE, (char *) NULL);
+    char *block_file = concat_dir_and_file (home_dir, BLOCK_FILE);
     int rc = 0;
 
     nomark = eval_marks (edit, &start_mark, &end_mark);
@@ -2653,7 +2653,7 @@ user_menu (WEdit * edit)
 
     if (mc_stat (block_file, &status) != 0 || !status.st_size) {
 	/* no block messages */
-	return;
+	goto cleanup;
     }
 
     if (!nomark) {
@@ -2672,5 +2672,7 @@ user_menu (WEdit * edit)
 
     edit_refresh_cmd (edit);
     edit->force |= REDRAW_COMPLETELY;
-    return;
+
+cleanup:
+    g_free (block_file);
 }