in do_cut_text(), if keep_cutbuffer is FALSE, only blow away the text in

the cutbuffer if the cutbuffer isn't empty

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

diff --git a/ChangeLog b/ChangeLog
index 55296e37f408fa3bf78e34dab1fa7aba6ab6a375..4831f39497d789f05ca29d70572fd7d1473fd0e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@ CVS code -
          buffer rather than the cutbuffer.  Changes to backup_lines(),
          do_justify(), etc. (DLR)
 - cut.c:
+  do_cut_text()
+       - If keep_cutbuffer is FALSE, only blow away the text in the
+         cutbuffer if the cutbuffer isn't empty. (DLR)
   do_uncut_text()
        - No longer duplicate Pico's adding an extra magicline to the
          file if uncutting leaves the cursor on the current one, as

diff --git a/src/cut.c b/src/cut.c
index a90defa6c297b9fa99e6aa4c89c9504ffe318ab6..1d4cac6c289532166f2f62e98c6ef05e89ec4cc0 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -101,9 +101,9 @@ void do_cut_text(void)
 
     check_statusblank();
 
-    /* If keep_cutbuffer is FALSE, blow away the text in the
-     * cutbuffer. */
-    if (!keep_cutbuffer) {
+    /* If keep_cutbuffer is FALSE and the cutbuffer isn't empty, blow
+     * away the text in the cutbuffer. */
+    if (!keep_cutbuffer && cutbuffer != NULL) {
        free_filestruct(cutbuffer);
        cutbuffer = NULL;
 #ifdef DEBUG