- search.c:do_search() - Check position of cursor and return value of findnextstr...

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1029 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 7b871473cc72f3354ed1f6796f475735994fd135..21fbcf98d10d8a4d0cd01843eb93c3ab39050b5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,9 @@ CVS code -
   parse_next_word()
        - Added support for "\ ", in word parsing.
 - search.c:
+  do_search()
+       - Check position of cursor and return value of findnextstr and
+         tell user if search string only occurs once (Rocco & Chris).
   findnextstr()
        - Fix off by one in check for wrap around (Rocco Corsi).
 - winio.c:

diff --git a/search.c b/search.c
index 7afe28e58c1b0afb95f19afb7fa3052acc545657..cfe1ce9832e4be2e72aeb525b48838003b563246 100644 (file)
--- a/search.c
+++ b/search.c
@@ -412,7 +412,8 @@ void search_abort(void)
 int do_search(void)
 {
     int i;
-    filestruct *fileptr = current;
+    filestruct *fileptr = current, *didfind;
+    int fileptr_x = current_x;
 
     wrap_reset();
     i = search_init(0);
@@ -449,8 +450,14 @@ int do_search(void)
        last_search = mallocstrcpy(last_search, answer);
 
     search_last_line = 0;
-    findnextstr(FALSE, FALSE, current, current_x, answer);
+    didfind = findnextstr(FALSE, FALSE, current, current_x, answer);
+
+    if ((fileptr == current) && (fileptr_x == current_x) &&
+       didfind != NULL)
+       statusbar(_("This is the only occurrence"));
+
     search_abort();
+
     return 1;
 }