mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2025-04-03 11:32:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Applying a textual patch by David Ramsey.

Browse Source 
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4587 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2014-02-22 10:28:58 +00:00
parent 6f517bccf0
commit b55ce29a48
3 changed files with 146 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ChangeLog
View File

@ -1,3 +1,7 @@
2014-02-22 David Lawrence Ramsey <pooka109@gmail.com>
* ChangeLog, NEWS, doc/faq.html - Fix typos, wording, and spacing.
2014-01-24 Benno Schulenberg <bens> 2014-01-24 Benno Schulenberg <bens>
* src/nano.c (copy_from_filestruct) - Check explicitly for mark being set when * src/nano.c (copy_from_filestruct) - Check explicitly for mark being set when
trying to partition, as we shouldn't be messing with the x address, etc. trying to partition, as we shouldn't be messing with the x address, etc.
@ -36,14 +40,14 @@
* do_cut_text - Fix copying (not cutting) text setting Modified state. Fixes * do_cut_text - Fix copying (not cutting) text setting Modified state. Fixes
issue reported by Benno Schulenberg. issue reported by Benno Schulenberg.
GNU nano 2.3.2 - 2011.03.23 GNU nano 2.3.2 - 2013.03.23
2013-03-17 Chris Allegretta <chrisa@asty.org> 2013-03-17 Chris Allegretta <chrisa@asty.org>
* Revert r4547 as we should have a new release and the overlap code is not yet * Revert r4547 as we should have a new release and the overlap code is not yet
ready for public consumption. ready for public consumption.
2013-01-20 Chris Allegretta <chrisa@asty.org> 2013-01-20 Chris Allegretta <chrisa@asty.org>
* src/text.c (do_histify): Don't allow sigwinch to be received while justifying * src/text.c (do_histify): Don't allow sigwinch to be received while justifying
as that puts us into a wacky state. Fixess crash on justify by Joshua Rogers. as that puts us into a wacky state. Fixes crash on justify by Joshua Rogers.
* configure.ac: Added --with-wordbounds option to let cross compilers force * configure.ac: Added --with-wordbounds option to let cross compilers force
whether their target system support GNU-style word boundaries or not. whether their target system support GNU-style word boundaries or not.
Originally reported by dave festing. Originally reported by dave festing.
@ -55,7 +59,7 @@ GNU nano 2.3.2 - 2011.03.23
actually works before defaulting to it over ncurses! Shock! actually works before defaulting to it over ncurses! Shock!
2013-01-13 Chris Allegretta <chrisa@asty.org> 2013-01-13 Chris Allegretta <chrisa@asty.org>
* src/utils.c (parse_num): Initalize errno before calling strtol(). Fixes issue * src/utils.c (parse_num): Initialize errno before calling strtol(). Fixes issue
where trying to go to a line number too long will break legitimate goto-lines where trying to go to a line number too long will break legitimate goto-lines
for the remainder of the editing session, reported by Joshua Rogers. for the remainder of the editing session, reported by Joshua Rogers.
@ -85,8 +89,8 @@ GNU nano 2.3.2 - 2011.03.23
2012-02-05 Chris Allegretta <chrisa@asty.org> 2012-02-05 Chris Allegretta <chrisa@asty.org>
* src/*: Fix overlapping strings highlighting each other. new variables in edit_draw * src/*: Fix overlapping strings highlighting each other. new variables in edit_draw
(slmatcharray, pbegin, paintok), new logic (with repeated setting od values in the (slmatcharray, pbegin, paintok), new logic (with repeated setting of values in the
array but its BFI after all). FIXME: Need to create a new 'overlap' array but it's BFI after all). FIXME: Need to create a new 'overlap'
* src/*: Fix a silly issue with the argument to nregcomp, as it's confusing to the caller * src/*: Fix a silly issue with the argument to nregcomp, as it's confusing to the caller
* src/nano.h: Change the color types to a compiler macro (COLORWIDTH), may not actually * src/nano.h: Change the color types to a compiler macro (COLORWIDTH), may not actually
even be worth doing, but someday who knows how wide a color curses implementation might even be worth doing, but someday who knows how wide a color curses implementation might
@ -94,7 +98,7 @@ GNU nano 2.3.2 - 2011.03.23
GNU nano 2.3.1 - 2011.05.10 GNU nano 2.3.1 - 2011.05.10
2011-05-10 Chris Allegretta <chrisa@asty.org> 2011-05-10 Chris Allegretta <chrisa@asty.org>
* text.c (do_enter): Only increment totsize by the auto-indented amount, size the previous line's size was * text.c (do_enter): Only increment totsize by the auto-indented amount, since the previous line's size was
already counted. Fixes bug reported by Robert Spanjaard. already counted. Fixes bug reported by Robert Spanjaard.
2011-05-08 Chris Allegretta <chrisa@asty.org> 2011-05-08 Chris Allegretta <chrisa@asty.org>
@ -143,7 +147,7 @@ GNU nano 2.3.0 - 2011.02.26
check_poshistory(), update_poshistory(), and reworking of histfilename(). New FAQ entry check_poshistory(), update_poshistory(), and reworking of histfilename(). New FAQ entry
4.15 discussing the change and offering an interoperability workaround. 4.15 discussing the change and offering an interoperability workaround.
* files.c (load_history): Set last_search to the last search value we loaded from history, * files.c (load_history): Set last_search to the last search value we loaded from history,
so do_research will succeed without needing to manually load the last seach in. Fixes so do_research will succeed without needing to manually load the last search in. Fixes
bug reported by Matthieu Lejeune. bug reported by Matthieu Lejeune.
2011-02-12 Chris Allegretta <chrisa@asty.org> 2011-02-12 Chris Allegretta <chrisa@asty.org>
@ -195,7 +199,7 @@ GNU nano 2.2.4 - 2010.04.15
2010-04-14 Chris Allegretta <chrisa@asty.org> 2010-04-14 Chris Allegretta <chrisa@asty.org>
* text.c (do_alt_speller): Skip invoking the alt speller if the file size * text.c (do_alt_speller): Skip invoking the alt speller if the file size
is 0 bytes. Fixes Savannah bug 29393 reported by Mike Frysinger. is 0 bytes. Fixes Savannah bug 29393 reported by Mike Frysinger.
* files.c (wirte_file): Don't set current_stat when tmp == TRUE, check * files.c (write_file): Don't set current_stat when tmp == TRUE, check
whether current_stat is set when trying to use it, and don't do the whether current_stat is set when trying to use it, and don't do the
modification check if the filename changed, since we have no way modification check if the filename changed, since we have no way
of knowing about it in that case. Fixes Savannah bug 29392, reported of knowing about it in that case. Fixes Savannah bug 29392, reported
@ -224,7 +228,6 @@ GNU nano 2.2.4 - 2010.04.15
file when its owner doesn't match the edited file. Based on security file when its owner doesn't match the edited file. Based on security
analysis on nano by Dan Rosenberg. [CVE-2010-1160] analysis on nano by Dan Rosenberg. [CVE-2010-1160]
2010-03-21 Chris Allegretta <chrisa@asty.org> 2010-03-21 Chris Allegretta <chrisa@asty.org>
* nano.c (page_stdin et al): Don't attempt to reset/reopen the terminal * nano.c (page_stdin et al): Don't attempt to reset/reopen the terminal
settings when reading stdin if it was aborted with SIGINT. May fix Savannah settings when reading stdin if it was aborted with SIGINT. May fix Savannah
@ -241,20 +244,20 @@ GNU nano 2.2.4 - 2010.04.15
2010-03-07 Chris Allegretta <chrisa@asty.org> 2010-03-07 Chris Allegretta <chrisa@asty.org>
* configure.ac, nano.c (handle_sigwinch): Create check for whether LINES and * configure.ac, nano.c (handle_sigwinch): Create check for whether LINES and
COLS can safely be redefined. Fixes compilation issues with cygwin, and likely COLS can safely be redefined. Fixes compilation issues with cygwin, and likely
with newer versions of ncurses, fixes Savannah bug 28984 repoted by Andy Koppe with newer versions of ncurses, fixes Savannah bug 28984 reported by Andy Koppe
and Eric Oliver via mailing list. and Eric Oliver via mailing list.
* winio.c (get_mouseinput) - fix stray semicolon in code, also reported in * winio.c (get_mouseinput) - fix stray semicolon in code, also reported in
bug 28984. bug 28984.
GNU nano 2.2.3 - 2010.02.11 GNU nano 2.2.3 - 2010.02.11
2010-01-28 Chris Allegretta <chrisa@asty.org> 2010-01-28 Chris Allegretta <chrisa@asty.org>
* move.c (do_page_up, do_page_down): Fix for smooth mode not preserving cusor * move.c (do_page_up, do_page_down): Fix for smooth mode not preserving cursor
position. Part one of fix for Savannah bug 21178 by Mike Frysinger. position. Part one of fix for Savannah bug 21178 by Mike Frysinger.
GNU nano 2.2.2 - 2010.01.17 GNU nano 2.2.2 - 2010.01.17
2010-01-17 Chris Allegretta <chrisa@asty.org> 2010-01-17 Chris Allegretta <chrisa@asty.org>
* nano.c (main), prompt.c (do_statusbar_input): Handle problems with an unmapped * nano.c (main), prompt.c (do_statusbar_input): Handle problems with an unmapped
function due to key rebinding, fixes crashes on FreeBSD repoted by Eitan function due to key rebinding, fixes crashes on FreeBSD reported by Eitan
Adler <eitanadlerlist@gmail.com>. Adler <eitanadlerlist@gmail.com>.
2010-01-14 Chris Allegretta <chrisa@asty.org> 2010-01-14 Chris Allegretta <chrisa@asty.org>
@ -346,7 +349,7 @@ GNU nano 2.2.1 - 2009.12.12
2009-12-01 Chris Allegretta <chrisa@asty.org> 2009-12-01 Chris Allegretta <chrisa@asty.org>
* global.c (shortcut_init) - Remove redundant entries for ^Y/^V reported by * global.c (shortcut_init) - Remove redundant entries for ^Y/^V reported by
Christian Weisgerber. Christian Weisgerber.
* doc/man/nanorc.5 - Fix typo in Meta documentation, reported by gibboris@gmail.com. * doc/man/nanorc.5 - Fix typo in Meta documentation, reported by <gibboris@gmail.com>.
2009-12-01 David Lawrence Ramsey <pooka109@gmail.com> 2009-12-01 David Lawrence Ramsey <pooka109@gmail.com>
* global.c (shortcut_init) - Add support for ^P and ^N in the help menu. * global.c (shortcut_init) - Add support for ^P and ^N in the help menu.
@ -355,9 +358,8 @@ GNU nano 2.2.1 - 2009.12.12
GNU nano 2.2.0 - 2009.11.30 GNU nano 2.2.0 - 2009.11.30
2009-11-29 Chris Allegretta <chrisa@asty.org> 2009-11-29 Chris Allegretta <chrisa@asty.org>
* prompt.c (get_prompt_string) - Universally handle help key when is * prompt.c (get_prompt_string) - Universally handle help key when it is
disabled. Fixes Savannah disabled. Fixes Savannah bug 28117 by David Lawrence Ramsey <pooka109@gmail.com>.
bug 28117 by David Lawrence Ramsey <pooka109@gmail.com>.
* chars.c, files.c: Add junk vars to silence the compiler. Sigh. * chars.c, files.c: Add junk vars to silence the compiler. Sigh.
2009-11-29 David Lawrence Ramsey <pooka109@gmail.com> 2009-11-29 David Lawrence Ramsey <pooka109@gmail.com>
@ -372,11 +374,11 @@ disabled. Fixes Savannah
first in an effort to not corrupt the screen, which contradicts Pico but is consistent first in an effort to not corrupt the screen, which contradicts Pico but is consistent
with almost all other text editors. Fixes Savannah bug 28110/Debian bug 460510 with almost all other text editors. Fixes Savannah bug 28110/Debian bug 460510
reported by Tim Connors <reportbug@rather.puzzling.org>. reported by Tim Connors <reportbug@rather.puzzling.org>.
* doc/dyntax/makefile.nanorc - Sample Makefile highlighting based on wiki.linuxhelp.net version. * doc/syntax/makefile.nanorc - Sample Makefile highlighting based on wiki.linuxhelp.net version.
2009-11-26 Chris Allegretta <chrisa@asty.org> 2009-11-26 Chris Allegretta <chrisa@asty.org>
* winio.c (edit_scroll): Adjust for long lines when scrolling. * winio.c (edit_scroll): Adjust for long lines when scrolling.
* rcfile.c (parse_rcfile), initialize size argument to getline(), fixes crash on FreeBSD * rcfile.c (parse_rcfile): initialize size argument to getline(), fixes crash on FreeBSD
reported by Eitan Adler <eitanadlerlist@gmail.com>. reported by Eitan Adler <eitanadlerlist@gmail.com>.
2009-11-26 Jordi Mallach <jordi@gnu.org> 2009-11-26 Jordi Mallach <jordi@gnu.org>
@ -405,7 +407,7 @@ GNU nano 2.1.99pre2 - 2009.11.21
Fixes Savannah bug 24957 by Mike Frysinger. Fixes Savannah bug 24957 by Mike Frysinger.
2009-11-19 Chris Allegretta <chrisa@asty.org> 2009-11-19 Chris Allegretta <chrisa@asty.org>
* nano.c (die_save_file) Try nd match the permissions of the file we were * nano.c (die_save_file) Try and match the permissions of the file we were
editing but only make a minimal effort to do so. Fixes Savannah bug 27273 editing but only make a minimal effort to do so. Fixes Savannah bug 27273
reported by Mike Frysinger. reported by Mike Frysinger.
@ -433,7 +435,7 @@ GNU nano 2.1.99pre1 - 2009.11.15
2009-11-11 Chris Allegretta <chrisa@asty.org> 2009-11-11 Chris Allegretta <chrisa@asty.org>
* winio.c: Large tweaking of cursor and text display based on COLS not COLS - 1, * winio.c: Large tweaking of cursor and text display based on COLS not COLS - 1,
due to finally understanding that display_string wasn't being called properly due to finally understanding that display_string wasn't being called properly
when softwrap was enabled. Fixes Savnnah bug 27603, Return key doesn't scroll when softwrap was enabled. Fixes Savannah bug 27603, Return key doesn't scroll
viewport reported by Hannes Schueller. viewport reported by Hannes Schueller.
* - Fix size_t formatting issues with -pedantic * - Fix size_t formatting issues with -pedantic
@ -508,7 +510,7 @@ GNU nano 2.1.10 - 2009.07.28
2009-07-11 Chris Allegretta <chrisa@asty.org> 2009-07-11 Chris Allegretta <chrisa@asty.org>
* nano-regress: Small tweaks * nano-regress: Small tweaks
* Change undo code to off unless unabled via a command line option (-u/--undo). Until this code * Change undo code to off unless enabled via a command line option (-u/--undo). Until this code
stabilizes this is the only responsible way to treat it. stabilizes this is the only responsible way to treat it.
2009-03-08 Chris Allegretta <chrisa@asty.org> 2009-03-08 Chris Allegretta <chrisa@asty.org>

21
NEWS
View File

@ -28,8 +28,18 @@
for the 'set allow_insecure_backup" nanorc option. for the 'set allow_insecure_backup" nanorc option.
Don't stop, get it get it, don't stop, get it get it. Don't stop, get it get it, don't stop, get it get it.
2010.11.22 - GNU nano 2.2.6 "Pimp my BBS" wants you to go to
www.desertbus.org and donate a few bucks for the great
Child's Play Charity! This is just a small release to
update a bug where restricted mode was not particularly
restricted since key bindings were introduced. It also
signals the return of win32 builds which now feature
nanorc support; please see the FAQ for details of how
to enable it, this feature is a bit of a kludge for now.
Remember that when all else fails, USE SPACE JUMP.
2010.08.05 - GNU nano 2.2.5 "Inactivity timeout" is now available. 2010.08.05 - GNU nano 2.2.5 "Inactivity timeout" is now available.
This release includes slightly less restrictive checkng This release includes slightly less restrictive checking
when writing files in strange environments (e.g. when writing files in strange environments (e.g.
when being used out of crontab). For very strange situations when being used out of crontab). For very strange situations
(such as where you cannot change the permissions on the (such as where you cannot change the permissions on the
@ -40,7 +50,7 @@
Keep fighting the good fight children. Keep fighting the good fight children.
2010.04.15 - GNU nano 2.2.4 is nobody's fool. First and foremost, 2010.04.15 - GNU nano 2.2.4 is nobody's fool. First and foremost,
this relase includes some security fixes due to this release includes some security fixes due to
an assessment of nano's vulnerability to symlink attacks an assessment of nano's vulnerability to symlink attacks
on open files. The CVEs fixed with this release are on open files. The CVEs fixed with this release are
CVE-2010-1160 and CVE-2010-1161. Also included are fixes CVE-2010-1160 and CVE-2010-1161. Also included are fixes
@ -52,12 +62,11 @@
the list would not be complete without our the list would not be complete without our
third-times-the-charm fixes to page up/down due to third-times-the-charm fixes to page up/down due to
the soft wrapping code. The lone new feature the soft wrapping code. The lone new feature
included is a new syntax higlighting definition for included is a new syntax highlighting definition for
cmake-related files. Please do consider upgrading to cmake-related files. Please do consider upgrading to
this release if still using the 2.0 series since this release if still using the 2.0 series since
fixes for that version are still forthcoming. fixes for that version are still forthcoming.
2010.02.11 - GNU nano 2.2.3 "fumbling toward stability" is released. 2010.02.11 - GNU nano 2.2.3 "fumbling toward stability" is released.
This release contains a fix for only one bug, but a This release contains a fix for only one bug, but a
rather irritating one: when paging up/down with smooth rather irritating one: when paging up/down with smooth
@ -95,7 +104,6 @@
contents of a read-only file into an existing buffer. contents of a read-only file into an existing buffer.
Enjoy and Happy Hanukkah. Enjoy and Happy Hanukkah.
2009.11.30 - GNU nano 2.2.0 "Doc Brown" is released! The culmination 2009.11.30 - GNU nano 2.2.0 "Doc Brown" is released! The culmination
of almost two years of development and hot on the heels of almost two years of development and hot on the heels
of nano's 10th birthday is available for all your of nano's 10th birthday is available for all your
@ -194,7 +202,6 @@
features you would like to see before the next stable features you would like to see before the next stable
series is released. Have fun with it! series is released. Have fun with it!
2008.11.10 - GNU nano 2.1.7 "Effingham" is ready to make good on those 2008.11.10 - GNU nano 2.1.7 "Effingham" is ready to make good on those
campaign promises of lower bug rates and 50% more pie. campaign promises of lower bug rates and 50% more pie.
This release includes a new check for external This release includes a new check for external
@ -242,7 +249,7 @@
are likely to run out of space; see Savannah bug 24000. are likely to run out of space; see Savannah bug 24000.
Have fun with it! Have fun with it!
2008.08.04 - GNY nano 2.1.3 "least stable version ever" is released. This 2008.08.04 - GNU nano 2.1.3 "least stable version ever" is released. This
release includes new (and experimental) undo and redo release includes new (and experimental) undo and redo
functionality for most text operations. The default functionality for most text operations. The default
key bindings are Meta-U for undo and Meta-E for redo, but key bindings are Meta-U for undo and Meta-E for redo, but

6
doc/faq.html
View File

@ -47,7 +47,7 @@
<a href="#4.12">4.12. I've compiled nano with color support, but I don't see any color when I run it!</a><br> <a href="#4.12">4.12. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
<a href="#4.13">4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a><br> <a href="#4.13">4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a><br>
<a href="#4.14">4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a><br> <a href="#4.14">4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a><br>
<a href="#4.15">4.15. On startup I get a message that says "Detected a legacy nano history file". Now other nano versionc can't find my search history!</a></p></blockquote> <a href="#4.15">4.15. On startup I get a message that says "Detected a legacy nano history file". Now other nano versions can't find my search history!</a></p></blockquote>
<h2><a href="#5">5. Internationalization</a></h2> <h2><a href="#5">5. Internationalization</a></h2>
<blockquote><p><a href="#5.1">5.1. There's no translation for my language!</a><br> <blockquote><p><a href="#5.1">5.1. There's no translation for my language!</a><br>
<a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a><br> <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a><br>
@ -223,8 +223,8 @@
<blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote> <blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
<h2><a name="4.14"></a>4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</h2> <h2><a name="4.14"></a>4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</h2>
<blockquote><p>You have the autoindent feature turned on. Hit Meta-I to turn it off, paste your text, and then hit Meta-I again to turn it back on.</p></blockquote> <blockquote><p>You have the autoindent feature turned on. Hit Meta-I to turn it off, paste your text, and then hit Meta-I again to turn it back on.</p></blockquote>
<h2><a name="4.15"></a>4.15. On startup I get a message that says "Detected a legacy nano history file". Now other nano versionc can't find my search history!</h2> <h2><a name="4.15"></a>4.15. On startup I get a message that says "Detected a legacy nano history file". Now other nano versions can't find my search history!</h2>
<blockquote><p>In nano 2.3.0, cursor position history was introduced, and both files now reside under a .nano directory in your home. Nano was trying to move this file into the new location so it could continue to use it. This means that if you try and use an earlier version of nano, it will be unable to see your previous search history. To fix this, run the following commands:<br> <blockquote><p>In nano 2.3.0, cursor position history was introduced, and both files now reside under a .nano directory in your home. nano was trying to move this file into the new location so it could continue to use it. This means that if you try and use an earlier version of nano, it will be unable to see your previous search history. To fix this, run the following commands:<br>
mv ~/.nano/search_history ~/.nano_history<br> mv ~/.nano/search_history ~/.nano_history<br>
ln -sf ~/.nano_history ~/.nano/search_history<br> ln -sf ~/.nano_history ~/.nano/search_history<br>
</p></blockquote> </p></blockquote>