Bugfixes and cruft cleanout take 1

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@139 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2000-07-28 01:18:10 +00:00
parent 7975ed86a7
commit 18bd029981
4 changed files with 44 additions and 47 deletions

View File

@ -1,7 +1,13 @@
CVS code
- nano.c:
splice_node():
splice_node()
- New function, abstracts linking in nodes. Fixes bug #36.
delete_buffer()
- Removed, same as free_filestruct().
- search.c:
replace_abort()
- redundant, now just calls search abort until it does something
different.
nano-0.9.14 - 07/27/2000
- nano.h:

13
nano.c
View File

@ -920,15 +920,6 @@ void do_early_abort(void)
blank_statusbar_refresh();
}
void delete_buffer(filestruct * inptr)
{
if (inptr != NULL) {
delete_buffer(inptr->next);
free(inptr->data);
free(inptr);
}
}
int do_backspace(void)
{
filestruct *previous, *tmp;
@ -1635,6 +1626,10 @@ int main(int argc, char *argv[])
case 'k':
SET(CUT_TO_END);
break;
#else
case 'k':
usage(); /* Oops! You dont really have that option */
finish(1);
#endif
case 'l':
UNSET(FOLLOW_SYMLINKS);

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2000-07-27 21:00-0400\n"
"POT-Creation-Date: 2000-07-27 21:18-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -55,7 +55,7 @@ msgstr ""
msgid "File to insert [from ./] "
msgstr ""
#: files.c:272 files.c:296 files.c:486 nano.c:1155
#: files.c:272 files.c:296 files.c:486 nano.c:1146
msgid "Cancelled"
msgstr ""
@ -576,85 +576,85 @@ msgstr ""
msgid "check_wrap called with inptr->data=\"%s\"\n"
msgstr ""
#: nano.c:941
#: nano.c:932
#, c-format
msgid "current->data now = \"%s\"\n"
msgstr ""
#: nano.c:994
#: nano.c:985
#, c-format
msgid "After, data = \"%s\"\n"
msgstr ""
#: nano.c:1064
#: nano.c:1055
msgid "Error deleting tempfile, ack!"
msgstr ""
#: nano.c:1082
#: nano.c:1073
#, c-format
msgid "Could not create a temporary filename: %s"
msgstr ""
#: nano.c:1105
#: nano.c:1096
#, c-format
msgid "Could not invoke spell program \"%s\""
msgstr ""
#. Why 32512? I dont know!
#: nano.c:1111
#: nano.c:1102
msgid "Could not invoke \"ispell\""
msgstr ""
#: nano.c:1124
#: nano.c:1115
msgid "Finished checking spelling"
msgstr ""
#: nano.c:1142
#: nano.c:1133
msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
msgstr ""
#: nano.c:1265
#: nano.c:1256
msgid "Cannot resize top win"
msgstr ""
#: nano.c:1267
#: nano.c:1258
msgid "Cannot move top win"
msgstr ""
#: nano.c:1269
#: nano.c:1260
msgid "Cannot resize edit win"
msgstr ""
#: nano.c:1271
#: nano.c:1262
msgid "Cannot move edit win"
msgstr ""
#: nano.c:1273
#: nano.c:1264
msgid "Cannot resize bottom win"
msgstr ""
#: nano.c:1275
#: nano.c:1266
msgid "Cannot move bottom win"
msgstr ""
#: nano.c:1748
#: nano.c:1743
msgid "Main: set up windows\n"
msgstr ""
#: nano.c:1770
#: nano.c:1765
msgid "Main: bottom win\n"
msgstr ""
#: nano.c:1776
#: nano.c:1771
msgid "Main: open file\n"
msgstr ""
#: nano.c:1849
#: nano.c:1844
#, c-format
msgid "I got Alt-[-%c! (%d)\n"
msgstr ""
#: nano.c:1865
#: nano.c:1860
#, c-format
msgid "I got Alt-%c! (%d)\n"
msgstr ""
@ -700,38 +700,38 @@ msgstr ""
msgid "Replaced 1 occurence"
msgstr ""
#: search.c:381 search.c:402 search.c:425
#: search.c:377 search.c:398 search.c:421
msgid "Replace Cancelled"
msgstr ""
#: search.c:398
#: search.c:394
#, c-format
msgid "Replace with [%s]"
msgstr ""
#. last_search is empty
#: search.c:423
#: search.c:419
msgid "Replace with"
msgstr ""
#: search.c:464
#: search.c:460
msgid "Replace this instance?"
msgstr ""
#. Ask for it
#: search.c:515
#: search.c:511
msgid "Enter line number"
msgstr ""
#: search.c:517
#: search.c:513
msgid "Aborted"
msgstr ""
#: search.c:537
#: search.c:533
msgid "Come on, be reasonable"
msgstr ""
#: search.c:542
#: search.c:538
#, c-format
msgid "Only %d lines available, skipping to last line"
msgstr ""

View File

@ -244,14 +244,10 @@ void print_replaced(int num)
void replace_abort(void)
{
UNSET(KEEP_CUTBUFFER);
display_main_list();
reset_cursor();
#ifdef _POSIX_VERSION
if (ISSET(REGEXP_COMPILED))
regexp_cleanup();
#endif
/* Identicle to search_abort, so we'll call it here. If it
does something different later, we can change it back. For now
it's just a waste to duplicat code */
search_abort();
}
#ifdef _POSIX_VERSION