mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2025-01-27 03:32:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rocco's fix for current_x increment

Browse Source 
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@303 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2000-11-20 01:29:37 +00:00
parent d466ab7be0
commit 1cc29f626d
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,7 +1,7 @@
CVS code - CVS code -
- search.c: - search.c:
findnextstr() findnextstr()
- Set current_x back before aborting (oops!). - Fix curent_x increment bug by using another variable (Rocco Corsi).
search_init() search_init()
- Silly typo in our "one simple call" of statusq. Stopped - Silly typo in our "one simple call" of statusq. Stopped
previous search string from being displayed. previous search string from being displayed.

28
po/nano.pot
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2000-11-19 14:12-0500\n" "POT-Creation-Date: 2000-11-19 20:28-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -751,7 +751,7 @@ msgstr ""
msgid " (to replace)" msgid " (to replace)"
msgstr "" msgstr ""
#: search.c:136 search.c:322 #: search.c:136 search.c:318
msgid "Search Cancelled" msgid "Search Cancelled"
msgstr "" msgstr ""
@ -760,54 +760,54 @@ msgstr ""
msgid "\"%s...\" not found" msgid "\"%s...\" not found"
msgstr "" msgstr ""
#: search.c:245 #: search.c:243
msgid "Search Wrapped" msgid "Search Wrapped"
msgstr "" msgstr ""
#: search.c:344 #: search.c:340
#, c-format #, c-format
msgid "Replaced %d occurences" msgid "Replaced %d occurences"
msgstr "" msgstr ""
#: search.c:346 #: search.c:342
msgid "Replaced 1 occurence" msgid "Replaced 1 occurence"
msgstr "" msgstr ""
#: search.c:483 search.c:576 search.c:592 #: search.c:479 search.c:572 search.c:588
msgid "Replace Cancelled" msgid "Replace Cancelled"
msgstr "" msgstr ""
#: search.c:526 #: search.c:522
msgid "Replace this instance?" msgid "Replace this instance?"
msgstr "" msgstr ""
#: search.c:534 #: search.c:530
msgid "Replace failed: unknown subexpression!" msgid "Replace failed: unknown subexpression!"
msgstr "" msgstr ""
#: search.c:617 #: search.c:613
#, c-format #, c-format
msgid "Replace with [%s]" msgid "Replace with [%s]"
msgstr "" msgstr ""
#: search.c:621 search.c:625 #: search.c:617 search.c:621
msgid "Replace with" msgid "Replace with"
msgstr "" msgstr ""
#. Ask for it #. Ask for it
#: search.c:660 #: search.c:656
msgid "Enter line number" msgid "Enter line number"
msgstr "" msgstr ""
#: search.c:662 #: search.c:658
msgid "Aborted" msgid "Aborted"
msgstr "" msgstr ""
#: search.c:682 #: search.c:678
msgid "Come on, be reasonable" msgid "Come on, be reasonable"
msgstr "" msgstr ""
#: search.c:687 #: search.c:683
#, c-format #, c-format
msgid "Only %d lines available, skipping to last line" msgid "Only %d lines available, skipping to last line"
msgstr "" msgstr ""

20
search.c
View File

@ -202,31 +202,29 @@ filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
{ {
filestruct *fileptr; filestruct *fileptr;
char *searchstr, *found = NULL, *tmp; char *searchstr, *found = NULL, *tmp;
int past_editbot = 0; int past_editbot = 0, current_x_find = current_x;
fileptr = current; fileptr = current;
current_x++; current_x_find++;
/* Are we searching the last line? (i.e. the line where search started) */ /* Are we searching the last line? (i.e. the line where search started) */
if ((fileptr == begin) && (current_x < beginx)) if ((fileptr == begin) && (current_x_find < beginx))
search_last_line = 1; search_last_line = 1;
/* Make sure we haven't passed the end of the string */ /* Make sure we haven't passed the end of the string */
if (strlen(fileptr->data) + 1 < current_x) if (strlen(fileptr->data) < current_x_find)
current_x--; current_x_find--;
searchstr = &fileptr->data[current_x]; searchstr = &fileptr->data[current_x_find];
/* Look for needle in searchstr */ /* Look for needle in searchstr */
while ((found = strstrwrapper(searchstr, needle)) == NULL) { while ((found = strstrwrapper(searchstr, needle)) == NULL) {
/* finished processing file, get out */ /* finished processing file, get out */
if (search_last_line) { if (search_last_line) {
if (!quiet) { if (!quiet)
not_found_msg(needle); not_found_msg(needle);
current_x--;
}
return NULL; return NULL;
} }
@ -260,10 +258,8 @@ filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
/* Ensure we haven't wrap around again! */ /* Ensure we haven't wrap around again! */
if ((search_last_line) && (current_x >= beginx)) { if ((search_last_line) && (current_x >= beginx)) {
if (!quiet) { if (!quiet)
not_found_msg(needle); not_found_msg(needle);
current_x--;
}
return NULL; return NULL;
} }