mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Benno Schulenberg 2014-02-22 10:56:52 +00:00
parent b55ce29a48
commit fb4e402411
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2014-02-22 David Lawrence Ramsey <pooka109@gmail.com> 2014-02-22 David Lawrence Ramsey <pooka109@gmail.com>
* 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 <pooka109@gmail.com>
* ChangeLog, NEWS, doc/faq.html - Fix typos, wording, and spacing. * ChangeLog, NEWS, doc/faq.html - Fix typos, wording, and spacing.
2014-01-24 Benno Schulenberg <bens> 2014-01-24 Benno Schulenberg <bens>

14
src/cut.c
View File

@ -207,11 +207,15 @@ void do_cut_text(
} else if (!undoing) } else if (!undoing)
update_undo(CUT); update_undo(CUT);
#endif #endif
/* Leave the text in the cutbuffer, and mark the file as /* Leave the text in the cutbuffer, and mark the file as
* modified. */ * modified. */
if (!copy_text) { #ifndef NANO_TINY
set_modified(); if (!copy_text) {
} #endif
set_modified();
#ifndef NANO_TINY
}
#endif
/* Update the screen. */ /* Update the screen. */
edit_refresh_needed = TRUE; edit_refresh_needed = TRUE;

4
src/nano.c
View File

@ -1398,7 +1398,7 @@ void do_toggle(int flag)
enabled = ISSET(flag); enabled = ISSET(flag);
if (flag == NO_HELP if (flag == NO_HELP
#ifndef DISABLE_WRAPPING #ifndef DISABLE_WRAPPING
|| flag == NO_WRAP || flag == NO_WRAP
#endif #endif
@ -1408,7 +1408,7 @@ void do_toggle(int flag)
) )
enabled = !enabled; enabled = !enabled;
desc = _(flagtostr(flag)); desc = (char *) _(flagtostr(flag));
statusbar("%s %s", desc, enabled ? _("enabled") : statusbar("%s %s", desc, enabled ? _("enabled") :
_("disabled")); _("disabled"));
} }