From: Chris Allegretta Date: Sun, 29 Nov 2009 06:24:10 +0000 (+0000) Subject: 2009-11-29 David Lawrence Ramsey X-Git-Tag: v2.2.0~1 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b43f6912f38206568a3a7ac868fdf256973197f7;p=nano.git 2009-11-29 David Lawrence Ramsey * global.c: Fix replace and insert file initializations for proper compilation options. * nano.c (do_suspend): Update comments to reflect actual code path, bad Chris and thanks for noticing Jordi. * configure.ac: Fix typos git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4449 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 4b3ad793..96f12b91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ 2009-11-29 David Lawrence Ramsey * Change several *chars to const char, additional cleanups and casts to make compilers happier. + * global.c: Fix replace and insert file initializations for proper compilation options. + * nano.c (do_suspend): Update comments to reflect actual code path, bad Chris and thanks for + noticing Jordi. + * configure.ac: Fix typos 2009-11-27 Chris Allegretta * nano.c (do_suspend): Don't clear the screen but do move the cursor down to the last line diff --git a/configure.ac b/configure.ac index b14d9cc0..b47458eb 100644 --- a/configure.ac +++ b/configure.ac @@ -191,7 +191,7 @@ fi], AC_ARG_ENABLE(all, [ --enable-all Enable ALL extra nano functionality (ignored for compatibility as all options default to on)], [if test x$enableval = xyes; then - echo "--enable-all option no longer needed, ignoring for compatiblity" + echo "--enable-all option no longer needed, ignoring for compatibility" fi]) AC_MSG_CHECKING([whether to enable UTF-8 support]) diff --git a/src/global.c b/src/global.c index ffb68b34..f87f2419 100644 --- a/src/global.c +++ b/src/global.c @@ -411,7 +411,10 @@ void print_sclist(void) /* Stuff we need to make at least static here so we can access it below */ +/* TRANSLATORS: Try to keep the next five strings at most 10 characters. */ const char *cancel_msg = N_("Cancel"); +const char *replace_msg = N_("Replace"); +const char *no_replace_msg = N_("No Replace"); #ifndef NANO_TINY const char *case_sens_msg = N_("Case Sens"); @@ -447,8 +450,6 @@ const char *ext_cmd_msg = ""; /* TRANSLATORS: Try to keep the next five strings at most 10 characters. */ const char *prev_history_msg = N_("PrevHstory"); const char *next_history_msg = N_("NextHstory"); -const char *replace_msg = N_("Replace"); -const char *no_replace_msg = N_("No Replace"); const char *gototext_msg = N_("Go To Text"); /* TRANSLATORS: Try to keep the next three strings at most 12 characters. */ const char *whereis_next_msg = N_("WhereIs Next"); @@ -490,7 +491,9 @@ void shortcut_init(bool unjustify) const char *fulljstify_msg = N_("FullJstify"); #endif const char *refresh_msg = N_("Refresh"); +#ifndef NANO_TINY const char *insert_file_msg = N_("Insert File"); +#endif const char *go_to_line_msg = N_("Go To Line"); #ifndef DISABLE_JUSTIFY diff --git a/src/nano.c b/src/nano.c index d88ac31e..b07abae3 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1184,8 +1184,7 @@ RETSIGTYPE do_suspend(int signal) disable_mouse_support(); #endif - /* Blank the screen, and move the cursor to the last line of the - * screen. */ + /* Move the cursor to the last line of the screen. */ move(LINES - 1, 0); endwin();