Ticket #2365: previous_seach.patch

src/panel.h

@@ -96 +96 @@
     struct   stat dir_stat;     /* Stat of current dir: used by execute () */
 
     gboolean searching;
+    char     previous_search_buffer [256];
     char     search_buffer [256];
     char     search_char [MB_LEN_MAX]; /*buffer for multibytes characters*/
     int      search_chpoint;           /*point after last characters in search_char*/

src/screen.c

@@ -2471 +2471 @@
             panel->selected = 0;
         else
             move_down (panel);
+
+        gboolean recall_search_string = panel->search_buffer[0] == '\0';
+
+        if (recall_search_string)
+        {
+           /* in case if there was no search string we need to recall
+              previous string, with which we ended previous searching */
+           strncpy(panel->search_buffer, panel->previous_search_buffer, 256);
+        }
+        
         do_search (panel, 0);
     }
     else
@@ -2488 +2498 @@
 stop_search (WPanel * panel)
 {
     panel->searching = FALSE;
+
+    gboolean had_search_string = panel->search_buffer[0] != '\0';
+
+    /* if user had overrdied search string, we need to store it to the
+       previous_search_buffer */
+    if (had_search_string) {
+       strncpy(panel->previous_search_buffer, panel->search_buffer, 256);
+    } 
+    
     display_mini_info (panel);
 }