Ticket #3494: 3494-Use-INPUT_LAST_TEXT-for-input_dialog-instead-of-stat.patch

src/diffviewer/ydiff.c

@@ -2913 +2913 @@
 static void
 dview_goto_cmd (WDiff * dview, diff_place_t ord)
 {
+    static gboolean first_run = TRUE;
+
     /* *INDENT-OFF* */
     static const char *title[2] = {
         N_("Goto line (left)"),
         N_("Goto line (right)")
     };
     /* *INDENT-ON* */
-    static char prev[256];
-    /* XXX some statics here, to be remembered between runs */
 
     int newline;
     char *input;
 
     input =
-        input_dialog (_(title[ord]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE, prev,
-                      INPUT_COMPLETE_NONE);
+        input_dialog (_(title[ord]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE,
+                      first_run ? NULL : INPUT_LAST_TEXT, INPUT_COMPLETE_NONE);
     if (input != NULL)
     {
         const char *s = input;
@@ -2948 +2948 @@
                 }
             }
             dview->skip_rows = dview->search.last_accessed_num_line = (ssize_t) i;
-            g_snprintf (prev, sizeof (prev), "%d", newline);
         }
         g_free (input);
     }
+
+    first_run = FALSE;
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -3211 +3212 @@
             find_prev_hunk (dview->a[DIFF_LEFT], dview->skip_rows);
         break;
     case CK_Goto:
-        dview_goto_cmd (dview, TRUE);
+        dview_goto_cmd (dview, DIFF_RIGHT);
         break;
     case CK_Edit:
         dview_edit (dview, dview->ord);

src/editor/editcmd.c

@@ -3028 +3028 @@
 void
 edit_goto_cmd (WEdit * edit)
 {
+    static gboolean first_run = TRUE;
+
     char *f;
-    static long line = 0;       /* line as typed, saved as default */
     long l;
     char *error;
-    char s[32];
 
-    g_snprintf (s, sizeof (s), "%ld", line);
-    f = input_dialog (_("Goto line"), _("Enter line:"), MC_HISTORY_EDIT_GOTO_LINE, line ? s : "",
-                      INPUT_COMPLETE_NONE);
+    f = input_dialog (_("Goto line"), _("Enter line:"), MC_HISTORY_EDIT_GOTO_LINE,
+                      first_run ? NULL : INPUT_LAST_TEXT, INPUT_COMPLETE_NONE);
     if (!f)
         return;
 
@@ -3053 +3052 @@
         return;
     }
 
-    line = l;
     if (l < 0)
         l = edit->buffer.lines + l + 2;
     edit_move_display (edit, l - WIDGET (edit)->lines / 2 - 1);
     edit_move_to_line (edit, l - 1);
     edit->force |= REDRAW_COMPLETELY;
     g_free (f);
+
+    first_run = FALSE;
 }
 
 
@@ -3140 +3140 @@
 int
 edit_sort_cmd (WEdit * edit)
 {
-    static char *old = 0;
     char *exp, *tmp, *tmp_edit_block_name, *tmp_edit_temp_name;
     off_t start_mark, end_mark;
     int e;
@@ -3157 +3156 @@
 
     exp = input_dialog (_("Run sort"),
                         _("Enter sort options (see manpage) separated by whitespace:"),
-                        MC_HISTORY_EDIT_SORT, (old != NULL) ? old : "", INPUT_COMPLETE_NONE);
+                        MC_HISTORY_EDIT_SORT, INPUT_LAST_TEXT, INPUT_COMPLETE_NONE);
 
     if (!exp)
         return 1;
-    g_free (old);
-    old = exp;
     tmp_edit_block_name = mc_config_get_full_path (EDIT_BLOCK_FILE);
     tmp_edit_temp_name = mc_config_get_full_path (EDIT_TEMP_FILE);
     tmp =
@@ -3276 +3273 @@
 void
 edit_mail_dialog (WEdit * edit)
 {
-    char *tmail_to = NULL;
-    char *tmail_subject = NULL;
-    char *tmail_cc = NULL;
-
-    static char *mail_cc_last = 0;
-    static char *mail_subject_last = 0;
-    static char *mail_to_last = 0;
-
+    char *mail_to, *mail_subject, *mail_cc;
 
     quick_widget_t quick_widgets[] = {
         /* *INDENT-OFF* */
         QUICK_LABEL (N_("mail -s <subject> -c <cc> <to>"), NULL),
         QUICK_LABELED_INPUT (N_("To"), input_label_above,
-                             mail_to_last != NULL ? mail_to_last : "", "mail-dlg-input-3",
-                             &tmail_to, NULL, FALSE, FALSE, INPUT_COMPLETE_USERNAMES),
+                             INPUT_LAST_TEXT, "mail-dlg-input-3",
+                             &mail_to, NULL, FALSE, FALSE, INPUT_COMPLETE_USERNAMES),
         QUICK_LABELED_INPUT (N_("Subject"), input_label_above,
-                              mail_subject_last != NULL ? mail_subject_last : "", "mail-dlg-input-2",
-                              &tmail_subject, NULL, FALSE, FALSE, INPUT_COMPLETE_NONE),
+                              INPUT_LAST_TEXT, "mail-dlg-input-2",
+                              &mail_subject, NULL, FALSE, FALSE, INPUT_COMPLETE_NONE),
         QUICK_LABELED_INPUT (N_("Copies to"), input_label_above,
-                             mail_cc_last != NULL ? mail_cc_last  : "", "mail-dlg-input",
-                             &tmail_cc, NULL, FALSE, FALSE, INPUT_COMPLETE_USERNAMES),
+                             INPUT_LAST_TEXT, "mail-dlg-input",
+                             &mail_cc, NULL, FALSE, FALSE, INPUT_COMPLETE_USERNAMES),
         QUICK_BUTTONS_OK_CANCEL,
         QUICK_END
         /* *INDENT-ON* */
@@ -3310 +3300 @@
 
     if (quick_dialog (&qdlg) != B_CANCEL)
     {
-        g_free (mail_cc_last);
-        g_free (mail_subject_last);
-        g_free (mail_to_last);
-        mail_cc_last = tmail_cc;
-        mail_subject_last = tmail_subject;
-        mail_to_last = tmail_to;
-        pipe_mail (&edit->buffer, mail_to_last, mail_subject_last, mail_cc_last);
+        pipe_mail (&edit->buffer, mail_to, mail_subject, mail_cc);
+        g_free (mail_to);
+        g_free (mail_subject);
+        g_free (mail_cc);
     }
 }