commit b43f6912f38206568a3a7ac868fdf256973197f7
parent 5a018f0d3a6fdc41c0f7026e7be1733f2b8447b2
Author: Chris Allegretta <chrisa@asty.org>
Date: Sun, 29 Nov 2009 06:24:10 +0000
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
Diffstat:
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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();