nano

commit 1929982ec39412411331a26a7c7bb0f684e082cc
parent b6377c9d14b6dc35528458f9eeb6fadbf12a49ef
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Sat,  9 Oct 2004 20:12:04 +0000

in do_insertfile(), when inserting a file in non-multibuffer mode,
preserve placewewant as well as current_x, for compatibility with Pico


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

Diffstat:
M
ChangeLog
 | 
3
+++
M
src/files.c
 | 
6
++++--

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -84,6 +84,9 @@ CVS code -
 	  cursor position at the statusbar is reset. (DLR)
 	- Add missing #ifdefs around the wrap_reset() call so that nano
 	  compiles with wrapping disabled again. (DLR)
+	- When inserting a file in non-multibuffer mode, preserve
+	  placewewant as well as current_x, for compatibility with
+	  Pico. (DLR)
   do_writeout()
 	- Restructure if blocks for greater efficiency, using
 	  do_insertfile() as a model. (DLR)
diff --git a/src/files.c b/src/files.c
@@ -540,7 +540,8 @@ void do_insertfile(
 	    statusbar(_("Cancelled"));
 	    break;
 	} else {
-	    int old_current_x = current_x;
+	    size_t old_current_x = current_x;
+	    size_t old_pww = placewewant;
 
 	    ans = mallocstrcpy(ans, answer);
 
@@ -596,8 +597,9 @@ void do_insertfile(
 		/* Mark the file as modified. */
 		set_modified();
 
-		/* Restore the old x-coordinate position. */
+		/* Restore the old cursor position. */
 		current_x = old_current_x;
+		placewewant = old_pww;
 #ifdef ENABLE_MULTIBUFFER
 	    }
 #endif