From fb4e402411eadbceefa24893cf66764fb2c3d562 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sat, 22 Feb 2014 10:56:52 +0000 Subject: [PATCH] Applying a compile-fixing and warning-fixing patch by David Ramsey. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4588 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 +++ src/cut.c | 14 +++++++++----- src/nano.c | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ca09be9..c8e53283 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-02-22 David Lawrence Ramsey + * src/nano.c (allow_pending_sigwinch) - A (char *) cast for pedantic purposes. + * src/cut.c (do_cut_text) - Wrap a reference to 'copy_text' in NANO_TINY. +2014-02-22 David Lawrence Ramsey * ChangeLog, NEWS, doc/faq.html - Fix typos, wording, and spacing. 2014-01-24 Benno Schulenberg diff --git a/src/cut.c b/src/cut.c index 60a1533a..552189b3 100644 --- a/src/cut.c +++ b/src/cut.c @@ -207,11 +207,15 @@ void do_cut_text( } else if (!undoing) update_undo(CUT); #endif - /* Leave the text in the cutbuffer, and mark the file as - * modified. */ - if (!copy_text) { - set_modified(); - } + /* Leave the text in the cutbuffer, and mark the file as + * modified. */ +#ifndef NANO_TINY + if (!copy_text) { +#endif + set_modified(); +#ifndef NANO_TINY + } +#endif /* Update the screen. */ edit_refresh_needed = TRUE; diff --git a/src/nano.c b/src/nano.c index 08c8441f..d31b2946 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1398,7 +1398,7 @@ void do_toggle(int flag) enabled = ISSET(flag); - if (flag == NO_HELP + if (flag == NO_HELP #ifndef DISABLE_WRAPPING || flag == NO_WRAP #endif @@ -1408,7 +1408,7 @@ void do_toggle(int flag) ) enabled = !enabled; - desc = _(flagtostr(flag)); + desc = (char *) _(flagtostr(flag)); statusbar("%s %s", desc, enabled ? _("enabled") : _("disabled")); } -- 2.39.5