Ticket #1496: mc-4.7.0-pre1.search_backwards.patch

edit/editcmd.c

@@ -1280 +1280 @@
     gsize search_end;
 
     if (edit->replace_backwards) {
-        search_end = edit->curs1-1;
+        search_end = edit->last_byte;
         while ((int) search_start >= 0) {
-            if (search_end - search_start > edit->search->original_len && mc_search_is_fixed_search_str(edit->search))
-                search_end = search_start + edit->search->original_len +1;
-            if ( mc_search_run(edit->search, (void *) edit, search_start, search_end, len))
+            if (search_end > search_start + edit->search->original_len && mc_search_is_fixed_search_str(edit->search))
+                search_end = search_start + edit->search->original_len;
+            if ( mc_search_run(edit->search, (void *) edit, search_start, search_end, len)
+                && edit->search->normal_offset == search_start )
             {
                 return TRUE;
             }

mc-4.7.0-pre1

@@ -3146 +3146 @@
     if (view->search_backwards) {
         search_end = view_get_filesize (view);
         while ((int) search_start >= 0) {
-            if (search_end - search_start > view->search->original_len && mc_search_is_fixed_search_str(view->search))
+            if (search_end > search_start + view->search->original_len && mc_search_is_fixed_search_str(view->search))
                 search_end = search_start + view->search->original_len;
 
             view_read_start (view, &view->search_onechar_info, search_start);
 
-            if ( mc_search_run(view->search, (void *) view, search_start, search_end, len))
+            if ( mc_search_run(view->search, (void *) view, search_start, search_end, len)
+                && view->search->normal_offset == search_start )
                 return TRUE;
 
             search_start--;