More -k fixes, almost works perfectly ;-)
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@130 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
cf037ba969
commit
63aa0f7f16
7
cut.c
7
cut.c
|
@ -56,6 +56,7 @@ void add_to_cutbuffer(filestruct * inptr)
|
||||||
|
|
||||||
inptr->next = NULL;
|
inptr->next = NULL;
|
||||||
cutbottom = inptr;
|
cutbottom = inptr;
|
||||||
|
dump_buffer(cutbuffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef NANO_SMALL
|
#ifndef NANO_SMALL
|
||||||
|
@ -134,7 +135,6 @@ int do_cut_text(void)
|
||||||
#ifndef NANO_SMALL
|
#ifndef NANO_SMALL
|
||||||
char *tmpstr;
|
char *tmpstr;
|
||||||
int newsize, cuttingtoend = 0;
|
int newsize, cuttingtoend = 0;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (fileptr == NULL || fileptr->data == NULL)
|
if (fileptr == NULL || fileptr->data == NULL)
|
||||||
|
@ -142,9 +142,10 @@ int do_cut_text(void)
|
||||||
|
|
||||||
tmp = fileptr->next;
|
tmp = fileptr->next;
|
||||||
|
|
||||||
if (!ISSET(KEEP_CUTBUFFER) || ISSET(MARK_ISSET)) {
|
if (!ISSET(KEEP_CUTBUFFER)) {
|
||||||
free_filestruct(cutbuffer);
|
free_filestruct(cutbuffer);
|
||||||
cutbuffer = NULL;
|
cutbuffer = NULL;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
fprintf(stderr, _("Blew away cutbuffer =)\n"));
|
fprintf(stderr, _("Blew away cutbuffer =)\n"));
|
||||||
#endif
|
#endif
|
||||||
|
@ -157,6 +158,7 @@ int do_cut_text(void)
|
||||||
/* FIXME - We really need to put this data into the
|
/* FIXME - We really need to put this data into the
|
||||||
cutbuffer, not delete it and forget about it. */
|
cutbuffer, not delete it and forget about it. */
|
||||||
do_delete();
|
do_delete();
|
||||||
|
SET(KEEP_CUTBUFFER);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -203,6 +205,7 @@ int do_cut_text(void)
|
||||||
|
|
||||||
placewewant = xplustabs();
|
placewewant = xplustabs();
|
||||||
UNSET(MARK_ISSET);
|
UNSET(MARK_ISSET);
|
||||||
|
|
||||||
marked_cut = 1;
|
marked_cut = 1;
|
||||||
set_modified();
|
set_modified();
|
||||||
if (cuttingtoend)
|
if (cuttingtoend)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"POT-Creation-Date: 2000-07-24 23:24-0400\n"
|
"POT-Creation-Date: 2000-07-26 23:51-0400\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"
|
||||||
|
@ -19,7 +19,7 @@ msgstr ""
|
||||||
msgid "add_to_cutbuffer called with inptr->data = %s\n"
|
msgid "add_to_cutbuffer called with inptr->data = %s\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: cut.c:149
|
#: cut.c:150
|
||||||
msgid "Blew away cutbuffer =)\n"
|
msgid "Blew away cutbuffer =)\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue