in do_insertfile(), if we're in view mode, as we can be if multibuffer

mode is on, don't mark the file as modified (and remove the code that
does this in execute_command()); also, if we execute a command in a new
buffer, move back to the beginning of the first line of the buffer
afterwards, for consistency


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3785 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
David Lawrence Ramsey
2006-07-13 03:06:36 +00:00
parent 49172cad95
commit 9a145d906f
3 changed files with 25 additions and 8 deletions

View File

@@ -811,8 +811,18 @@ void do_insertfile(
/* Save the command's output in the current buffer. */
execute_command(answer);
} else {
#ifdef ENABLE_MULTIBUFFER
if (ISSET(MULTIBUFFER)) {
/* Move back to the beginning of the first line of
* the buffer. */
openfile->current = openfile->fileage;
openfile->current_x = 0;
openfile->placewewant = 0;
}
#endif
} else {
#endif /* !NANO_TINY */
/* Make sure the path to the file specified in answer is
* tilde-expanded. */
answer = mallocstrassn(answer,
@@ -861,8 +871,10 @@ void do_insertfile(
/* Restore the old place we want. */
openfile->placewewant = pww_save;
/* Mark the file as modified. */
set_modified();
/* Mark the file as modified, unless we're here in view
* mode, which we can be if multibuffer mode is on. */
if (!ISSET(VIEW_MODE))
set_modified();
/* Update the screen. */
edit_refresh();