Fixed bug #31

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

diff --git a/BUGS b/BUGS
index 4a9d3f80f3cde4d94692895c2cfaedb4812afe34..fe0eb1cb7037f1c04aa491da9330bd475764cfc8 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -32,6 +32,7 @@
   is made to the buffer, and a write is attempted, nano will not give you
   a dialog about not being able to write the file, and it will not let the
   user exit (29, discovered by Joshua Jensen) [FIXED]
+- Using nano -k, marked text is not cut properly. (31) [FIXED]
 
 ** Open BUGS **
 
@@ -49,4 +50,4 @@
 - totsize becomes incorrect after word-wrapping (25)
 - In search/replace code there is too much refreshing in bottomwin (26)
 - In replace, there is no way to accept the default replace string. (27)
-
+- Using nano -t, user can not exit until a filename is given via ^O. (30)

diff --git a/cut.c b/cut.c
index 76bcf024a6b01fd120f4ee5fd451542109babb88..02a4762aec100af263977dea7b1838d0141fe1b5 100644 (file)
--- a/cut.c
+++ b/cut.c
@@ -149,7 +149,7 @@ int do_cut_text(void)
 #endif
     }
 #ifndef NANO_SMALL
-    if (ISSET(CUT_TO_END)) {
+    if (ISSET(CUT_TO_END) && !ISSET(MARK_ISSET)) {
        SET(MARK_ISSET);
        mark_beginbuf = current;
        mark_beginx = strlen(current->data);

diff --git a/po/nano.pot b/po/nano.pot
index 751758e6839afd70ef877791f7439743dd9a459e..1eb51aff6313cf5e42624aa0264e0de64b58bfff 100644 (file)
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-24 11:21-0400\n"
+"POT-Creation-Date: 2000-07-24 14:32-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"