2009-11-29 David Lawrence Ramsey <pooka109@gmail.com>

        * 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 4b3ad793e0720070b59b0ebce4df18beb7bfb9d5..96f12b91b35530e6c9be0bb7b508666095fe3e57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 
 2009-11-29 David Lawrence Ramsey <pooka109@gmail.com>
        * 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 <chrisa@asty.org>
        * 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 b14d9cc04dc0668e4924010e6aab458dceb4dc6d..b47458eb1d42b3f9988888b8f577ebf6e12ac64f 100644 (file)
--- 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 ffb68b349166dfa24c7894797bff1419d1fea098..f87f2419706ebfb0c4f86a7d9597509268948702 100644 (file)
--- 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 d88ac31ec0baf241e22f2cd2c3f294b60387638c..b07abae3434256a046ff12a50de86f048f7c0aa2 100644 (file)
--- 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();