From c6908f28b7b9b6f1ba09122f35dbbbd402153afc Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Thu, 11 Mar 2004 02:20:25 +0000
Subject: [PATCH] minor bits

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1691 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
 ChangeLog    |  6 ++++++
 src/files.c  |  2 +-
 src/search.c | 12 +++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c812c15..96ee6616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@ CVS code -
   do_insertfile()
 	- Wrap one reference to NANO_EXTCMD_KEY in a NANO_SMALL #ifdef.
 	  (DLR)
+	- Save the already-typed answer when switching from "Insert
+	  File" to "Execute Command" mode via Ctrl-X, just in case we
+	  started typing a command before switching. (DLR)
   add_open_files()
 	- Make the saving of marked status in open_files->file_flags
 	  work properly again; a tweak to the ISSET() macro in 1.3.0
@@ -152,6 +155,9 @@ CVS code -
 	  efficiency tweaks. (David Benbennick)  DLR: Tweak to follow
 	  the old behavior of adding non-blank strings entered at the
 	  "Replace: " prompt to the search history. (DLR)
+  do_gotoline()
+	- Simplify the edit_update() call depending on the value of
+	  save_pos. (David Benbennick)
   do_bracket()
 	- Add efficiency tweaks. (David Benbennick)  DLR: Remove
 	  reliance on the hardcoded bracket string length; instead, only
diff --git a/src/files.c b/src/files.c
index ea9dd368..35610dc3 100644
--- a/src/files.c
+++ b/src/files.c
@@ -501,7 +501,7 @@ int do_insertfile(int loading_file)
 #endif /* ENABLE_MULTIBUFFER */
 
 	if (i == NANO_EXTCMD_KEY) {
-	    int ts = statusq(TRUE, extcmd_list, "", NULL, 
+	    int ts = statusq(TRUE, extcmd_list, answer, NULL, 
 		_("Command to execute"));
 	    if (ts  == -1 || answer == NULL || answer[0] == '\0') {
 		statusbar(_("Cancelled"));
diff --git a/src/search.c b/src/search.c
index 9ce635c3..020eb4db 100644
--- a/src/search.c
+++ b/src/search.c
@@ -829,7 +829,7 @@ int do_gotoline(int line, int save_pos)
 
 	line = atoi(answer);
 
-	/* Bounds check */
+	/* Bounds check. */
 	if (line <= 0) {
 	    statusbar(_("Come on, be reasonable"));
 	    display_main_list();
@@ -842,12 +842,10 @@ int do_gotoline(int line, int save_pos)
 
     current_x = 0;
 
-    /* if save_pos is nonzero, don't change the cursor position when
-       updating the edit window */
-    if (save_pos)
-    	edit_update(current, NONE);
-    else
-	edit_update(current, CENTER);
+    /* If save_pos is nonzero, don't change the cursor position when
+     * updating the edit window. */
+    edit_update(current, save_pos ? NONE : CENTER);
+
     placewewant = 0;
     display_main_list();
     return 1;
-- 
2.39.5