Better fix for -k bug

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

diff --git a/ChangeLog b/ChangeLog
index e4c5a3b6da5eb92ad2ff7a0a79f82a65781b538d..616d7a7fbf125c818d2e36835d7d3b55ba91208d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,8 @@ CVS code -
        - Add bizarre copy of bot node, else *BSD goes ballistic (fixes
          BUG #60)
   do_cut_text()
-       - If the next line is empty when using -k, create a dummy line
-         and add it to the cutbuffer (fixes bug #61)
+       - If the line is empty when using -k and wasn't already added,
+         create a dummy line and add it to the cutbuffer (fixes bug #61)
 - files.c:
   do_browser()
        - Don't shift the size of the file is it's less than 1K. Fixed

diff --git a/cut.c b/cut.c
index 1fbb0a29f6795234b5a6431f383cde522016a84e..13717c665a8d8a46b1095e5650c4a2ee0e743edb 100644 (file)
--- a/cut.c
+++ b/cut.c
@@ -165,16 +165,12 @@ int do_cut_text(void)
     if (ISSET(CUT_TO_END) && !ISSET(MARK_ISSET)) {
        if (current_x == strlen(current->data)) {
 
-           /* If the next line is empty, create a dummy line and add it
-               to the cutbuffer */
-           if ((current->next != NULL && strlen(current->next->data) == 0) ||
-               (current == fileage && strlen(current->data) == 0)) {
+           /* If the line is empty and we didn't just cut a non-blank
+               line, create a dummy line and add it to the cutbuffer */
+           if (current_x == 0 && marked_cut != 1) {
                filestruct *junk;
 
-               if (current == fileage)
-                   junk = copy_node(current);
-               else
-                   junk = copy_node(current->next);
+               junk = copy_node(current);
 
                add_to_cutbuffer(junk);
            }