From f4e75e125605041f502e8774000044c1c2eb79d7 Mon Sep 17 00:00:00 2001
From: Chris Allegretta <chrisa@asty.org>
Date: Mon, 24 Jul 2000 18:28:30 +0000
Subject: [PATCH] Fixed bug #31

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@121 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
 BUGS        | 3 ++-
 cut.c       | 2 +-
 po/nano.pot | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BUGS b/BUGS
index 4a9d3f80..fe0eb1cb 100644
--- 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 76bcf024..02a4762a 100644
--- 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 751758e6..1eb51aff 100644
--- 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"
-- 
GitLab