From 8b6f6fcc1b763cc5c4413e0b66a7ebb2740e1450 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Sun, 22 Nov 2009 21:35:56 +0000 Subject: [PATCH] 2009-11-22 Chris Allegretta * nano.c (main): Allow edit_refresh_needed to take effect when using --enable-tiny (fixes Savannah bug 28076 reported by David Lawrence Ramsey). 2009-11-22 David Lawrence Ramsey * nano.c (move_to_filestruct): Fix bug 71 (cut at top of line recenters) * Fix compilation with --enable-tiny git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4439 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- BUGS | 2 +- ChangeLog | 8 ++++++++ src/nano.c | 30 +++++++++++++++++++++--------- src/proto.h | 6 +++++- 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/BUGS b/BUGS index 272d2bc1..5bd111ec 100644 --- a/BUGS +++ b/BUGS @@ -1,5 +1,4 @@ ** Open BUGS ** -- Cutting the line at the top of the screen recenters to center (71) ** Fixed BUGS ** - Marked cutting sometimes leaves a newline in the file unintelligently, @@ -156,6 +155,7 @@ assigned to it (79 - may not be worth fixing) [FIXED] - Segfault editing at COLS presumably due to new color syntax highlighting (80) [FIXED] +- Cutting the line at the top of the screen recenters to center (71) [FIXED] $Id$ diff --git a/ChangeLog b/ChangeLog index f4991b32..0bc76d7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-11-22 Chris Allegretta + * nano.c (main): Allow edit_refresh_needed to take effect when using --enable-tiny + (fixes Savannah bug 28076 reported by David Lawrence Ramsey). + +2009-11-22 David Lawrence Ramsey + * nano.c (move_to_filestruct): Fix bug 71 (cut at top of line recenters) + * Fix compilation with --enable-tiny + 2009-11-22 Mike Frysinger * doc/syntax/gentoo.nanorc: Tweak comment highlighting. diff --git a/src/nano.c b/src/nano.c index 7562c712..a1c6dc0e 100644 --- a/src/nano.c +++ b/src/nano.c @@ -394,11 +394,7 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot, /* If the top of the edit window was inside the old partition, put * it in range of current. */ if (edittop_inside) - edit_update( -#ifndef NANO_TINY - ISSET(SMOOTH_SCROLL) ? NONE : -#endif - CENTER); + edit_update(NONE); /* Renumber starting with the beginning line of the old * partition. */ @@ -638,7 +634,11 @@ void die(const char *msg, ...) if (filepart != NULL) unpartition_filestruct(&filepart); - die_save_file(openfile->filename, openfile->current_stat); + die_save_file(openfile->filename +#ifndef NANO_TINY + , openfile->current_stat +#endif + ); } #ifdef ENABLE_MULTIBUFFER @@ -651,7 +651,11 @@ void die(const char *msg, ...) /* Save the current file buffer if it's been modified. */ if (openfile->modified) - die_save_file(openfile->filename, openfile->current_stat); + die_save_file(openfile->filename +#ifndef NANO_TINY + , openfile->current_stat +#endif + ); } } #endif @@ -662,7 +666,11 @@ void die(const char *msg, ...) /* Save the current file under the name spacified in die_filename, which * is modified to be unique if necessary. */ -void die_save_file(const char *die_filename, struct stat *die_stat) +void die_save_file(const char *die_filename +#ifndef NANO_TINY + , struct stat *die_stat +#endif + ) { char *retval; bool failed = TRUE; @@ -691,6 +699,7 @@ void die_save_file(const char *die_filename, struct stat *die_stat) fprintf(stderr, _("\nBuffer not written: %s\n"), _("Too many backup files?")); +#ifndef NANO_TINY /* Try and chmod/chown the save file to the values of the original file, but dont worry if it fails because we're supposed to be bailing as fast as possible. */ @@ -699,6 +708,7 @@ void die_save_file(const char *die_filename, struct stat *die_stat) shush = chmod(retval, die_stat->st_mode); shush = chown(retval, die_stat->st_uid, die_stat->st_gid); } +#endif free(retval); } @@ -1621,6 +1631,7 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool && openfile->syntax->nmultis > 0) { reset_multis(openfile->current, FALSE); } +#endif if (edit_refresh_needed) { #ifdef DEBUG fprintf(stderr, "running edit_refresh() as edit_refresh_needed is true\n"); @@ -1629,7 +1640,6 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool edit_refresh_needed = FALSE; } -#endif } } } @@ -2404,10 +2414,12 @@ int main(int argc, char **argv) #endif #endif /* ENABLE_NANORC */ +#ifndef DISABLE_WRAPPING /* Overwrite an rcfile "set nowrap" or --disable-wrapping-as-root if a --fill option was given on the command line. */ if (fill_used) UNSET(NO_WRAP); +#endif /* If we're using bold text instead of reverse video text, set it up * now. */ diff --git a/src/proto.h b/src/proto.h index 1abbc4dc..11ba44a8 100644 --- a/src/proto.h +++ b/src/proto.h @@ -428,7 +428,11 @@ void free_openfilestruct(openfilestruct *src); void print_view_warning(void); void finish(void); void die(const char *msg, ...); -void die_save_file(const char *die_filename, struct stat *die_stat); +void die_save_file(const char *die_filename +#ifndef NANO_TINY + , struct stat *die_stat +#endif + ); void window_init(void); #ifndef DISABLE_MOUSE void disable_mouse_support(void); -- 2.39.5