Compare commits

...

46 Commits

Author SHA1 Message Date
David Lawrence Ramsey
f8df4a0fcb GNU nano 2.0.0
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3933 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-11-06 16:03:12 +00:00
David Lawrence Ramsey
f0c6e78a6e clean up nano.spec.in some more
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3932 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-11-05 17:13:44 +00:00
David Lawrence Ramsey
e88bc62258 more cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3931 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-11-05 17:00:41 +00:00
David Lawrence Ramsey
ca74e42a84 cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3930 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-11-05 03:51:28 +00:00
David Lawrence Ramsey
6b9e7cf5be update nano.spec.in for newer RPM-based distributions, adapted from the
nano 1.3.12-1.1.spec file in Fedora Rawhide


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3929 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-11-05 03:44:41 +00:00
David Lawrence Ramsey
1bb4db6409 add POV-Ray syntax from Donnie Berkholz, with a few tweaks of mine
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3928 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-11-02 06:21:43 +00:00
David Lawrence Ramsey
e693023de8 fix changelog entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3927 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-30 17:08:32 +00:00
David Lawrence Ramsey
e54f1c4eaa more comment fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3926 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-29 21:14:53 +00:00
David Lawrence Ramsey
08cf2528e1 update AUTHORS for the 2.0 branch of nano
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3925 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-28 22:55:08 +00:00
Jordi Mallach
40dcea0e2e Update French manpages by Jean-Philippe Guérard.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3924 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-28 22:03:25 +00:00
David Lawrence Ramsey
cb6ad31a8e fix changelog entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3923 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-28 21:57:24 +00:00
David Lawrence Ramsey
057f239b43 update faq.html for the 2.0 branch of nano
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3922 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-28 21:55:22 +00:00
David Lawrence Ramsey
890eab8270 update nano.spec.in for the 2.0 branch of nano
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3921 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-28 21:51:21 +00:00
David Lawrence Ramsey
32612ddcde preemptively update the version number
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3920 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-28 19:32:47 +00:00
David Lawrence Ramsey
3660bc6a46 in nano.1, nanorc.5, and rnano.1, add minor wording fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3919 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-28 19:21:12 +00:00
David Lawrence Ramsey
cca9bdd177 fix the version number
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3918 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-27 05:01:48 +00:00
David Lawrence Ramsey
9f0fccd713 in nano.texi, add minor punctuation fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3917 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-27 03:07:49 +00:00
David Lawrence Ramsey
65ab1c87b7 in nano.texi, add minor wording fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3916 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-27 02:57:35 +00:00
David Lawrence Ramsey
0c0cafbc19 comment fix
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3915 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-26 15:55:39 +00:00
David Lawrence Ramsey
76520a8ec4 Back to CVS
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3914 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-25 15:28:20 +00:00
David Lawrence Ramsey
1295699d03 GNU nano 1.9.99pre3
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3912 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-25 15:27:08 +00:00
David Lawrence Ramsey
ee8edfc64c preemptively update the version number
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3911 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-25 14:40:49 +00:00
Jordi Mallach
273b9e8d5b French and Norwegian bokmaal updates from the TP.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3910 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-24 22:14:50 +00:00
David Lawrence Ramsey
85f9f0f941 simplify
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3909 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-18 20:27:52 +00:00
David Lawrence Ramsey
385e772e54 fix changelog entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3908 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-17 15:28:49 +00:00
David Lawrence Ramsey
ab8c7162d3 in do_cut_text(), when uncutting text in the process of copying it,
always set placewewant, as do_uncut_text() does, so that the current
line is always updated properly


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3907 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-16 19:44:13 +00:00
Jordi Mallach
152f57bf9c New Galician update from Fran.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3906 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-16 18:43:03 +00:00
Jordi Mallach
8ee8915c49 Updated Galician translation from Fran.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3905 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-16 09:36:06 +00:00
Jordi Mallach
a447a2d810 Updated Basque from the TP.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3904 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-15 22:49:48 +00:00
David Lawrence Ramsey
22066a2cad fix changelog entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3903 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-14 16:04:44 +00:00
David Lawrence Ramsey
c603fefbf6 import the latest version of ac_define_dir.m4
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3902 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-14 01:13:13 +00:00
David Lawrence Ramsey
b5652a4d56 fix breakage
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3901 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-13 16:35:57 +00:00
David Lawrence Ramsey
98bca94758 in input_tab(), if the tab-completed path is a directory, make sure
enough space is allocated before tacking a slash onto the end of it


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3900 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-13 16:18:40 +00:00
Jordi Mallach
8c9256a731 Updated Galician translation from Fran Tsao, while his paperwork gets to GNU offices.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3899 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-10 08:14:00 +00:00
David Lawrence Ramsey
89ae4a343c miscellaneous minor fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3898 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-08 15:21:23 +00:00
David Lawrence Ramsey
61525a1e29 add missing line break
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3897 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-06 17:49:53 +00:00
David Lawrence Ramsey
97e0d665de typo fix
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3896 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-06 16:00:13 +00:00
David Lawrence Ramsey
e4769dfeab in faq.html, update the question in section 4.13 to match the version of
it in the answer section


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3895 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-06 15:52:41 +00:00
David Lawrence Ramsey
ee35aa3b01 yet one more TODO list entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3894 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-04 14:19:13 +00:00
David Lawrence Ramsey
23b9907048 add missing blank line
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3893 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-03 19:15:01 +00:00
David Lawrence Ramsey
85307fe28e in input_tab(), since the field precision operator used in the sprintf()
uses ints and not size_t's, replace it with two strncpy()s, which use
size_t's


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3892 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-03 18:46:00 +00:00
David Lawrence Ramsey
1755e28ad9 in parse_help_input(), add 'E' and 'e' as aliases for Exit, for
consistency with the file browser


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3891 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-02 21:25:41 +00:00
David Lawrence Ramsey
6db9ebbe04 formatting fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3890 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-02 19:45:34 +00:00
Jordi Mallach
77369f425b Updated pt_BR from the TP, using the correct file.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3889 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-02 17:15:27 +00:00
David Lawrence Ramsey
52804ab8e8 in doc/syntax/c.nanorc, simplify "undef", "ifn?def", "elif", and "else"
in the preprocessor regexes


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3888 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-02 17:01:58 +00:00
David Lawrence Ramsey
6e379c254e Back to CVS
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3887 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-10-02 04:09:48 +00:00
33 changed files with 4037 additions and 3623 deletions

View File

@@ -4,10 +4,10 @@ nano editor. Please see the ChangeLog for specific changes by author.
-------------------------------------------------------------------------
Chris Allegretta <chrisa@asty.org>
* Original program author, stable series maintainer.
* Original program author, former stable series maintainer.
David Lawrence Ramsey <pooka109@cox.net>
* Development series maintainer. Multiple buffer support,
* Current stable series maintainer. Multiple buffer support,
operating dir (-o) option, bug fixes for display routines,
wrapping code, spelling fixes, const mode, parts of the UTF-8
support, and various other fixes.

View File

@@ -1,3 +1,56 @@
GNU nano 2.0.0 - 2006.11.06
- General:
- Miscellaneous comment fixes. (DLR)
- Add syntax for POV-Ray files. New file doc/syntax/pov.nanorc;
changes to doc/nanorc.sample.in and doc/syntax/Makefile.am.
(Donnie Berkholz, minor tweaks by DLR)
- AUTHORS:
- Update for the 2.0 branch of nano. (DLR)
- nano.spec.in:
- Update links for the 2.0 branch of nano. (DLR)
- Update for newer RPM-based distributions. (DLR, adapted from
the nano 1.3.12-1.1.spec file in Fedora Rawhide)
- Delete the changelog section, as it hasn't been kept up to
date, and all its changes are documented here in any case.
(DLR)
- doc/faq.html:
- Update links for the 2.0 branch of nano. (DLR)
- doc/nano.1, doc/nanorc.5, doc/rnano.1:
- Add minor wording fixes. (DLR)
- doc/man/fr/nano.1, doc/man/fr/nanorc.5, doc/man/fr/rnano.1:
- Updated manpage translations by Jean-Philippe Guérard.
- doc/nano.texi:
- Add minor wording and punctuation fixes. (DLR)
GNU nano 1.9.99pre3 - 2006.10.25
- chars.c:
nstrncasecmp()
- When returning, use the "?" operator instead of an if/else
clause. (DLR)
- cut.c:
do_cut_text()
- When uncutting text in the process of copying it, always set
placewewant, as do_uncut_text() does, so that the current line
is always updated properly. (DLR)
- files.c:
input_tab()
- Since the field precision operator used in the sprintf() uses
ints and not size_t's, replace it with two strncpy()s, which
use size_t's, and a null termination. (DLR)
- help.c:
parse_help_input()
- Add 'E' and 'e' as aliases for Exit, for consistency with the
file browser. (DLR)
- m4/ac_define_dir.m4:
- Import the latest version of this file from
http://autoconf-archive.cryp.to/ac_define_dir.m4. (DLR)
- doc/faq.html:
- Update the question in section 4.13 to match the version of it
in the answer section. (DLR)
- doc/syntax/c.nanorc:
- Simplify "undef", "ifn?def", "elif", and "else" in the
preprocessor regexes. (DLR)
GNU nano 1.9.99pre2 - 2006.10.02
- General:
- Miscellaneous comment fixes. (DLR)
@@ -541,7 +594,7 @@ GNU nano 1.3.12 - 2006.06.26
have fewer than 24 columns, for consistency with the toggle
help text. (DLR, suggested by Benno Schulenberg)
parse_help_input()
- Add Space and - as aliases for PageDown and PageUp, for
- Add Space and '-' as aliases for PageDown and PageUp, for
consistency with the file browser. (DLR, suggested by Benno
Schulenberg)
- Remove redundant key checks. (DLR)

22
NEWS
View File

@@ -1,3 +1,25 @@
2006.11.06 - GNU nano 2.0.0 does its little dance. This release adds
documentation updates and a few cosmetic tweaks.
For those who haven't been following nano 1.3
development, there are a ton of new features, including
support for UTF-8, moving to a specified line and column
instead of just a line, improved color syntax
highlighting, inserting previously untypeable characters
using "Verbatim Input" mode, and copying text into the
cutbuffer without cutting it. There are also fixes for
some long-standing bugs, such as the "NumLock glitch"
from nano 1.2.x, and the inability to unjustify text
after resizing. Finally, there are also a ton of
translation updates and new translations, as well as new
color syntaxes. See the UPGRADE file for more
information, and enjoy the new stable release.
2006.10.25 - GNU nano 1.9.99pre3 learns to appreciate life. This
release fixes a bug where the screen sometimes wouldn't
be updated properly after copying text into the
cutbuffer, fixes a potential warning while compiling,
and fixes a few other minor inconsistencies. Have fun.
2006.10.02 - GNU nano 1.9.99pre2 crosses the threshold. This release
fixes a few more bugs: cursor positioning after leaving
the statusbar prompt has been fixed, and verbatim input

1
TODO
View File

@@ -34,6 +34,7 @@ For the next version:
keystroke, e.g. M-` (M-~) to go to the top line, M-& (M-7) to go to
the center line, and M-' (M-") to go to the last line.
- Allow searching for and replacing newlines.
- Allow soft wrapping as well as hard wrapping?
Old requests:

View File

@@ -19,7 +19,7 @@
#
# $Id$
AC_INIT([GNU nano], [1.9.99pre2], [nano-devel@gnu.org], [nano])
AC_INIT([GNU nano], [2.0.0], [nano-devel@gnu.org], [nano])
AC_CONFIG_SRCDIR([src/nano.c])
AC_CANONICAL_TARGET([])
AM_INIT_AUTOMAKE

View File

@@ -44,7 +44,7 @@
<a href="#4.10b">4.10b. [version 1.1.99pre1 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</a><br>
<a href="#4.11">4.11. How do I make nano my default editor (in Pine, mutt, etc.)?</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 the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a></p></blockquote>
<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></p></blockquote>
<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>
<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>
@@ -84,9 +84,9 @@
<h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
<blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
<h2><a name="1.6"></a>1.6. What is the current version of nano?</h2>
<blockquote><p>The current version of nano *should* be 1.9.99pre2. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
<blockquote><p>The current version of nano *should* be 2.0.0. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
<h2><a name="1.7"></a>1.7. I want to read the man page without having to download the program!</h2>
<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v1.3/nano.1.html">here</a>.</p></blockquote>
<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v2.0/nano.1.html">here</a>.</p></blockquote>
<hr width="100%">
<h1><a name="2"></a>2. Where to get GNU nano.</h1>
<h2><a name="2.1"></a>2.1. FTP and WWW sites that carry nano.</h2>
@@ -247,7 +247,7 @@
help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
<h2><a name="7.2"></a>7.2. I want to send the development team a big load of cash (or just a thank you).</h2>
<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v1.3/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v1.3/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v2.0/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v2.0/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
<h2><a name="7.3"></a>7.3. How do I submit a patch?</h2>
<blockquote><p>See Section <a href="#7.2">7.2</a>.</p></blockquote>
<h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
@@ -255,8 +255,9 @@
<h2><a name="7.5"></a>7.5. Can I have CVS write access?</h2>
<blockquote><p>Re-read Section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
<h2><a name="8"></a>8. ChangeLog</h2>
<blockquote>
<p>2006/07/25 - Update section 5.3 again to not state &quot;the latest development version&quot; before 1.3.12, as it's no longer accurate. Also add some minor spacing fixes. (DLR)<br>
<blockquote><p>2006/10/28 - Update various links for the 2.0 branch of nano. (DLR)<br>
2006/10/06 - Update the question in section 4.13 to match the version of it in the answer section. (DLR)<br>
2006/07/25 - Update section 5.3 again to not state &quot;the latest development version&quot; before 1.3.12, as it's no longer accurate. Also add some minor spacing fixes. (DLR)<br>
2006/06/12 - Update section 5.3, due to the display fix for two-column Unicode characters. (DLR)<br>
2006/06/05 - Add a new section 4.8, and move all section 4 entries after it down one number, to explain how to deal with glibc 2.2.3's crashes involving extended regular expressions. (DLR)<br>
2006/06/04 - Add minor punctuation, wording, and typo fixes. (DLR)<br>

View File

@@ -15,7 +15,7 @@
.\" AUCUNE garantie.
.\"
.\" $Id$
.TH NANO 1 "version 1.9.99pre1" "28\ août\ 2006"
.TH NANO 1 "version 2.0.0" "28\ octobre\ 2006"
.\" Please adjust this date whenever revising the manpage.
.\" Merci de modifier ces dates à chaque mise à jour de cette page.
.\"
@@ -39,8 +39,8 @@ Pico, l'
contentant pas de copier l'interface et l'ergonomie de Pico, il offre
également certaines fonctions manquantes (ou désactivées par défaut)
dans Pico. Ces fonctionnalités sont, par exemple, les fonctions de
recherche et de remplacement, et la possibilité de sauter directement à un
numéro de ligne.
recherche et de remplacement, et la possibilité de sauter directement à
une ligne et à une colonne précise.
.SH OPTIONS
.TP
@@ -276,10 +276,10 @@ manuel a
le système Debian (mais elle peut être utilisée par d'autres).
.SH TRADUCTION
Cette adaptation française a été réalisé par Jean-Philippe\ Guérard
<jean-philippe.guerard@tigreraye.org> le 28\ août\ 2006 à partir
de la version du 12\ juillet\ 2006 de la page de manuel de nano
1.9.99pre1. Cette page a été relue par Gérard Delafond.
Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
<jean-philippe.guerard@tigreraye.org> le 28\ octobre\ 2006 à partir
de la version du 28\ octobre\ 2006 de la page de manuel de nano
2.0.0. Cette page a été relue par Gérard Delafond.
Un maximum de soin a été apporté lors de l'élaboration de cette
traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si

View File

@@ -15,7 +15,7 @@
.\" AUCUNE garantie.
.\"
\" $Id$
.TH NANORC 5 "version 1.9.99pre1" "28\ août\ 2006"
.TH NANORC 5 "version 2.0.0" "28\ octobre\ 2006"
.\" Please adjust this date whenever revising the manpage.
.\" Merci de modifier ces dates à chaque mise à jour de cette page.
@@ -32,7 +32,7 @@ remplacer Pico, l'
Pico, il offre également certaines fonctionnalités manquantes (ou
désactivées par défaut) de Pico. Ces fonctionnalités sont, par exemple,
les fonctions de recherche et de remplacement et la possibilité de
sauter directement à un numéro de ligne.
sauter directement à une ligne et à une colonne précise.
.PP
Le fichier \fInanorc\fP contient les paramètres par défaut de
\fBnano\fP. Il ne doit pas être au format DOS ou Mac. Lors de son
@@ -325,10 +325,10 @@ manuel a
le système Debian (mais elle peut être utilisée par d'autres).
.SH TRADUCTION
Cette adaptation française a été réalisé par Jean-Philippe\ Guérard
<jean-philippe.guerard@tigreraye.org> le 28\ août\ 2006 à partir de
la version du 30\ juillet\ 2006 de la page de manuel de nanorc (pour la
version 1.9.99pre1 de nano). Cette page a été relue par Gérard
Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
<jean-philippe.guerard@tigreraye.org> le 28\ octobre\ 2006 à partir de
la version du 28\ octobre\ 2006 de la page de manuel de nanorc (pour la
version 2.0.0 de nano). Cette page a été relue par Gérard
Delafond.
Un maximum de soin a été apporté lors de l'élaboration de cette

View File

@@ -16,7 +16,7 @@
.\" AUCUNE garantie.
.\"
.\" $Id$
.TH RNANO 1 "version 1.9.99pre1" "28\ août\ 20O6"
.TH RNANO 1 "version 2.0.0" "28\ octobre\ 20O6"
.\" Please adjust this date whenever revising the manpage.
.\" Merci de modifier ces dates à chaque mise à jour de cette page.
.\"
@@ -41,7 +41,7 @@ remplacer Pico, l'
Pico, il offre également certaines fonctions manquantes (ou désactivées
par défaut) dans Pico. Ces fonctionnalités sont, par exemple, les
fonctions de recherche et de remplacement, et la possibilité de sauter
directement à un numéro de ligne.
directement à une ligne et à une colonne précise..
.PP
\fBrnano\fP est une version de \fBnano\fP fonctionnant en mode
restreint, qui ne permet d'éditer que les fichiers indiqués et qui
@@ -105,10 +105,10 @@ Thijs Kinkhorst <thijs@kinkhorst.com>, pour le syst
elle peut être utilisée par d'autres).
.SH TRADUCTION
Cette adaptation française a été réalisé par Jean-Philippe\ Guérard
<jean-philippe.guerard@tigreraye.org> le 28\ août\ 2006 à partir
de la version du 12\ juillet\ 2006 de la page de manuel de rnano
(pour la version 1.9.99pre1 de nano).
Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
<jean-philippe.guerard@tigreraye.org> le 28\ octobre\ 2006 à partir
de la version du 28\ octobre\ 2006 de la page de manuel de rnano
(pour la version 2.0.0 de nano).
Un maximum de soin a été apporté lors de l'élaboration de cette
traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si

View File

@@ -7,7 +7,7 @@
.\" warranty.
.\"
.\" $Id$
.TH NANO 1 "version 1.9.99pre1" "July 12, 2006"
.TH NANO 1 "version 2.0.0" "October 28, 2006"
.\" Please adjust this date whenever revising the manpage.
.\"
@@ -29,7 +29,7 @@ This manual page briefly documents the \fBnano\fP command.
Pico, the default editor included in the non-free Pine package. Rather
than just copying Pico's look and feel, \fBnano\fP also implements some
missing (or disabled by default) features in Pico, such as "search and
replace" and "go to line number".
replace" and "go to line and column number".
.SH OPTIONS
.TP

View File

@@ -7,7 +7,7 @@
.\" warranty.
.\"
.\" $Id$
.TH NANORC 5 "version 1.9.99pre1" "July 30, 2006"
.TH NANORC 5 "version 2.0.0" "October 28, 2006"
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
@@ -19,7 +19,7 @@ This manual page briefly documents GNU \fBnano\fP's rcfile.
Pico, the default editor included in the non-free Pine package. Rather
than just copying Pico's look and feel, \fBnano\fP also implements some
missing (or disabled by default) features in Pico, such as "search and
replace" and "go to line number".
replace" and "go to line and column number".
.PP
The \fInanorc\fP file contains the default settings for \fBnano\fP. It
should not be in DOS or Mac format. During startup, \fBnano\fP will

View File

@@ -8,7 +8,7 @@
.\" warranty.
.\"
.\" $Id$
.TH RNANO 1 "version 1.9.99pre1" "July 12, 2006"
.TH RNANO 1 "version 2.0.0" "October 28, 2006"
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
@@ -30,7 +30,7 @@ This manual page briefly documents the \fBrnano\fP command.
Pico, the default editor included in the non-free Pine package. Rather
than just copying Pico's look and feel, \fBnano\fP also implements some
missing (or disabled by default) features in Pico, such as "search and
replace" and "go to line number".
replace" and "go to line and column number".
.PP
\fBrnano\fP is a restricted version of \fBnano\fP, which only edits
specific files and doesn't allow the user access to the filesystem or a

View File

@@ -255,3 +255,6 @@
## Bourne shell scripts
# include "@PKGDATADIR@/sh.nanorc"
## POV-Ray
# include "@PKGDATADIR@/pov.nanorc"

View File

@@ -8,6 +8,7 @@ pkgdata_DATA = asm.nanorc \
nanorc.nanorc \
patch.nanorc \
perl.nanorc \
pov.nanorc \
python.nanorc \
ruby.nanorc \
sh.nanorc \

View File

@@ -8,7 +8,7 @@ color green "\<(class|namespace|template|public|protected|private|typename|this|
color brightyellow "\<(for|if|while|do|else|case|default|switch)\>"
color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
color magenta "\<(goto|continue|break|return)\>"
color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
color brightcyan "^[[:space:]]*#[[:space:]]*(define|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
##
## GCC builtins

15
doc/syntax/pov.nanorc Normal file
View File

@@ -0,0 +1,15 @@
## Here is an example for POV-Ray.
##
syntax "pov" "\.(pov|POV|povray|POVRAY)$"
color brightcyan "^[[:space:]]*#[[:space:]]*(declare)"
color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
color brightred "^\<(texture)\>"
color brightred "\<(light_source|background)\>"
color brightred "\<(fog|object|camera)\>"
color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
color brightmagenta "\<(union|group|subgroup)\>"
## Comment highlighting
color brightblue "//.*"
color brightblue start="/\*" end="\*/"

View File

@@ -8,8 +8,8 @@
@c Run 'makeinfo' rather than 'texinfo-format-buffer'.
@smallbook
@set EDITION 0.1
@set VERSION 1.9.99pre1
@set UPDATED 30 Jul 2006
@set VERSION 2.0.0
@set UPDATED 27 Oct 2006
@dircategory Editors
@direntry
@@ -23,7 +23,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor.
@subtitle version 1.9.99pre1
@subtitle version 2.0.0
@author Chris Allegretta
@page
@@ -64,8 +64,9 @@ editor.
GNU @code{nano} is a small and friendly text editor. Besides basic text
editing, @code{nano} offers many extra features like an interactive
search and replace, go to line number, auto-indentation, feature
toggles, internationalization support, and filename tab completion.
search and replace, go to line and column number, auto-indentation,
feature toggles, internationalization support, and filename tab
completion.
@menu
* Overview::
@@ -731,7 +732,7 @@ position of the cursor.
@item Interactive Replace and Spell Checker
It is worth noting that @code{nano}'s replace function is interactive,
i.e, it does not stop after one search string is found and automatically
i.e. it does not stop after one search string is found and automatically
replace it. The @code{nano} implementation will pause at each search
string found and query whether to replace this instance or not. The
internal spell checker operates similarly. Note that there is no way to
@@ -792,8 +793,8 @@ line option, which enables long line wrapping.
@item --enable-tiny
This option disables all the above. It also disables some of the larger
internals of the editor, like the marking code and the cut to line code.
It also disables the function toggles.
internals of the editor, like the marking code and the cut to end of
line code. It also disables the function toggles.
@item --enable-debug
Enable support for runtime debug output. This can get pretty messy, so

View File

@@ -13,9 +13,9 @@ dnl
dnl @category Misc
dnl @author Stepan Kasal <kasal@ucw.cz>
dnl @author Andreas Schwab <schwab@suse.de>
dnl @author Guido Draheim <guidod@gmx.de>
dnl @author Guido U. Draheim <guidod@gmx.de>
dnl @author Alexandre Oliva
dnl @version 2005-07-29
dnl @version 2006-10-13
dnl @license AllPermissive
AC_DEFUN([AC_DEFINE_DIR], [

View File

@@ -1,45 +1,39 @@
%define name @PACKAGE@
%define ver @VERSION@
%define rel 1
%define version @VERSION@
%define release 1
Summary : Pico editor clone with enhancements
Name : %{name}
Version : %{ver}
Release : %{rel}
Copyright : GPL
Group : Console/Editors
Version : %{version}
Release : %{release}
License : GPL
Group : Applications/Editors
URL : http://www.nano-editor.org/
Source : http://www.nano-editor.org/dist/v1.3/%{name}-%{ver}.tar.gz
BuildRoot : /var/tmp/%{name}-buildroot
Requires : ncurses
Source : http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
BuildRoot : %{_tmppath}/%{name}-%{version}-root
BuildRequires : autoconf, automake, gettext-devel, ncurses-devel
%description
GNU nano is a small and friendly text editor. It aims to emulate the Pico
text editor while also offering a few enhancements.
GNU nano is a small and friendly text editor. It aims to emulate the
Pico text editor while also offering a few enhancements.
%prep
%setup -q
%build
%configure --enable-all
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
make
%install
rm -rf "$RPM_BUILD_ROOT"
make DESTDIR="$RPM_BUILD_ROOT" install
rm -rf %{buildroot}
make DESTDIR="%{buildroot}" install
%files
%defattr(-,root,root)
%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
%{_bindir}/*
%{_mandir}/*/*
%{_mandir}/man*/*
%{_mandir}/fr/man*/*
%{_infodir}/nano.info*
%{_datadir}/locale/*/LC_MESSAGES/nano.mo
%{_datadir}/nano/*
%{_infodir}/nano.info*
%changelog
* Sat Mar 30 2002 Chris Allegretta <chrisa@asty.org>
- Accepted into main distribution
- Added Packager and URL tage from original spec file.
* Tue Mar 06 2002 Brett Pemberton <generica@email.com>
- Initial spec-file

View File

@@ -1,10 +1,36 @@
2006-10-25 Jordi Mallach <jordi@gnu.org>
* fr.po: Updated French translation by Jean-Philippe Guérard.
* nb.po: Updated Norwegian bokmål translation by
Geir Helland.
2006-10-16 Jordi Mallach <jordi@gnu.org>
* gl.po: Updated Galician translation by
Francisco Javier Tsao Santín.
2006-10-16 Jordi Mallach <jordi@gnu.org>
* eu.po: Updated Basque translation by Mikel Olasagasti.
2006-10-10 Jordi Mallach <jordi@gnu.org>
* gl.po: Updated Galician translation by
Francisco Javier Tsao Santín.
2006-10-02 Jordi Mallach <jordi@gnu.org>
* pt_BR.po: Refetch the current nano 1.9.99pre0 pt_BR file from
the TP, as the latest file offered is apparently for 1.3.11pre1.
2006-10-02 David Lawrence Ramsey <pooka109@cox.net>
* pt_BR: Restore previous version of pt_BR, as it was for
* pt_BR.po: Restore previous version of pt_BR, as it was for
nano 1.9.99pre0, and the current version is for 1.3.11pre1.
2006-09-27 Jordi Mallach <jordi@gnu.org>
* pt_BR: Updated Brazilian Portuguese translation by
* pt_BR.po: Updated Brazilian Portuguese translation by
Joao Victor Duarte Martins.
2006-09-10 David Lawrence Ramsey <pooka109@cox.net>
@@ -17,7 +43,7 @@
2006-09-02 Jordi Mallach <jordi@gnu.org>
* pt_BR: Updated Brazilian Portuguese translation by
* pt_BR.po: Updated Brazilian Portuguese translation by
Joao Victor Duarte Martins.
2006-09-01 Benno Schulenberg <bensberg@justemail.net>
@@ -210,7 +236,7 @@
2005-04-22 Jordi Mallach <jordi@gnu.org>
* ca.po: Updated Norwegian bokmål translation by
* nb.po: Updated Norwegian bokmål translation by
Geir Helland.
2005-04-20 Jordi Mallach <jordi@gnu.org>

1822
po/eu.po

File diff suppressed because it is too large Load Diff

View File

@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: nano 1.9.99pre0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-08-19 07:34-0400\n"
"PO-Revision-Date: 2006-08-28 00:52+0200\n"
"PO-Revision-Date: 2006-10-16 23:32+0200\n"
"Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
@@ -2168,7 +2168,7 @@ msgstr "--syntax=<cha
# File: src/nano.c, line: 791
#: src/nano.c:792
msgid "Syntax definition to use for coloring"
msgstr "Définition de la syntaxe de colorisation"
msgstr "Définit la syntaxe de colorisation"
#
# File: src/nano.c, line: 793

3331
po/gl.po

File diff suppressed because it is too large Load Diff

2169
po/nb.po

File diff suppressed because it is too large Load Diff

View File

@@ -1,15 +1,15 @@
# Portugueses Translation for the nano textual domain
# Copyright (C) 2006 Free Software Foundation, Inc.
# This file is distributed under the same license as the nano package.
# Joao Victor Duarte Martins <jvdm@sdf.lonestar.org>, 2006.
# J. Victor D. Martins <jvdm@sdf.lonestar.org>, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: nano 1.9.99pre0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-08-19 07:34-0400\n"
"PO-Revision-Date: 2006-09-02 12:06-0300\n"
"Last-Translator: Joao Victor Duarte Martins <jvdm@sdf.lonestar.org>\n"
"PO-Revision-Date: 2006-09-27 02:13-0300\n"
"Last-Translator: J. Victor D. Martins <jvdm@sdf.lonestar.org>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
@@ -1553,10 +1553,9 @@ msgstr "Falta o nome da cor"
msgid "Background color \"%s\" cannot be bright"
msgstr "Cor do fundo \"%s\" não pode ser clara"
# regex?
#: src/rcfile.c:503
msgid "Missing regex string"
msgstr "Falta string da regex"
msgstr "Falta a expressão regular"
#: src/rcfile.c:575
msgid "\"start=\" requires a corresponding \"end=\""
@@ -1820,26 +1819,26 @@ msgstr "Obrigado por utilizar o nano!"
#~ msgstr "Encontrar outro parenteses"
#~ msgid "Make the current search/replace case (in)sensitive"
#~ msgstr "Tornar a busca/substitução atual sensível a caixa"
#~ msgstr "Tornar a busca/reposição atual sensível a caixa"
#~ msgid "Make the current search/replace go backwards"
#~ msgstr "Tornar a busca/substituição atual de trás pra frente"
#~ msgstr "Tornar a busca/reposição atual ao contrário"
#~ msgid "Prepend to the current file"
#~ msgstr "Pré-Adicionar para a arquivo atual"
#~ msgstr "Pre-adicionar ao arquivo atual"
#~ msgid "Back up original file when saving"
#~ msgstr "Fazer o bacape do arquivo original quando salvá-lo"
#~ msgid "Insert into new buffer"
#~ msgstr "Inserir no novo buffer"
#~ msgstr "Inserir em um novo buffer"
#~ msgid ""
#~ "\n"
#~ "Buffer not written to %s (too many backup files?)\n"
#~ msgstr ""
#~ "\n"
#~ "Buffer não foi escrito no %s (muitos arquivos de bacape?)\n"
#~ "Buffer não foi escrito no %s (talvez muitos arquivos de segurança?)\n"
#~ msgid ""
#~ " nano help text\n"
@@ -1851,23 +1850,9 @@ msgstr "Obrigado por utilizar o nano!"
#~ msgstr ""
#~ " texto de ajuda do nano\n"
#~ "\n"
#~ "O editor nano foi projetado para emular as funcionalidades e as facilidades de uso\n"
#~ "do editor de texto UW Pico. Existem quatro grandes seções no editor editor: A\n"
#~ "linha superior mostra a versão do programa, o arquivo editado atualmente, e se\n"
#~ "o arquivo foi modificado ou não. A próxima é a a seção principal da tela do\n"
#~ "editor, mostrando o arquivo que está sendo editado. A linha de avisos é a\n"
#~ "terceira apartir da última e mostra mensagens importantes. As outras duas mostram\n"
#~ "os atalhos mais comuns utilizados no editor.\n"
#~ "O editor nano foi projetado para emular as funcionalidades e as facilidades de uso do editor de texto UW Pico. Existem quatro grandes seções no editor editor: A linha superior mostra a versão do programa, o arquivo editado atualmente, e se o arquivo foi modificado ou não. A próxima é a a seção principal da tela do editor, mostrando o arquivo que está sendo editado. A linha de avisos é a terceira apartir da última e mostra mensagens importantes. As outras duas mostram os atalhos mais comuns utilizados no editor.\n"
#~ "\n"
#~ " A notação para atalhos é a seguinte: Sequências de tecla-<Control> são grafadas\n"
#~ "com o cirfunflexo (^) e podem ser inseridas tanto utilizando as teclas <Ctrl> ou\n"
#~ "precionando <ESC> duas vezes. Sequências com teclas de escape são grafadas\n"
#~ "com o símbolo Meta (M) e podem tanto ser inseridas utilizando a telca <ESC>, <Alt>\n"
#~ "ou tecla meta, dependendo da configuração do seu teclado. Também precionando <ESC>\n"
#~ "duas vezes ou digitando um número de três dígitos de 000 à 255 você irá inserir\n"
#~ "um caractere correspondende ao respectivo código ASCII. Os seguintes atalhos de\n"
#~ "teclado estão disponíveis na tela principal do editor. Teclas alternativas são\n"
#~ "mostradas entre parenteses:\n"
#~ " A notação para atalhos é a seguinte: Sequências de tecla-<Control> são grafadas com o cirfunflexo (^) e podem ser inseridas tanto utilizando as teclas <Ctrl> ou precionando <ESC> duas vezes. Sequências com teclas de escape são grafadas com o símbolo Meta (M) e podem tanto ser inseridas utilizando a telca <ESC>, <Alt> ou tecla meta, dependendo da configuração do seu teclado. \"\n"
#~ "\n"
#~ msgid "Up"
@@ -1891,7 +1876,7 @@ msgstr "Obrigado por utilizar o nano!"
#~ msgstr "+LINHA"
#~ msgid "Do regular expression searches"
#~ msgstr "Expressão regular procurada"
#~ msgstr "Buscar por expressões regulares"
#~ msgid "Set fill cols to (wrap lines at) #cols"
#~ msgstr "Ajustar preenchimento de cols para (ajustar linhas em) #cols"

View File

@@ -514,10 +514,7 @@ int nstrncasecmp(const char *s1, const char *s2, size_t n)
break;
}
if (n > 0)
return tolower(*s1) - tolower(*s2);
else
return 0;
return (n > 0) ? tolower(*s1) - tolower(*s2) : 0;
}
#endif
@@ -1026,8 +1023,7 @@ bool is_valid_mbstring(const char *s)
return
#ifdef ENABLE_UTF8
use_utf8 ?
(mbstowcs(NULL, s, 0) != (size_t)-1) :
use_utf8 ? (mbstowcs(NULL, s, 0) != (size_t)-1) :
#endif
TRUE;
}

View File

@@ -194,6 +194,10 @@ void do_cut_text(
cb_save->data -= cb_save_len;
} else
copy_from_filestruct(cutbuffer, cutbottom);
/* Set the current place we want to where the text from the
* cutbuffer ends. */
openfile->placewewant = xplustabs();
}
/* Set NO_NEWLINES back to what it was before, since we're done

View File

@@ -2239,16 +2239,17 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
free(match2_mb);
mzero = charalloc(lastslash_len + common_len + 1);
sprintf(mzero, "%.*s%.*s", lastslash_len, buf, common_len,
matches[0]);
strncpy(mzero, buf, lastslash_len);
strncpy(mzero + lastslash_len, matches[0], common_len);
common_len += lastslash_len;
mzero[common_len] = '\0';
assert(common_len >= *place);
if (num_matches == 1 && is_dir(mzero)) {
mzero[common_len] = '/';
common_len++;
mzero[common_len++] = '/';
assert(common_len > *place);
}
@@ -2378,6 +2379,7 @@ char *histfilename(void)
strcpy(nanohist, homedir);
strcpy(nanohist + homelen, "/.nano_history");
}
return nanohist;
}

View File

@@ -586,6 +586,8 @@ void parse_help_input(int *kbinput, bool *meta_key, bool *func_key)
break;
/* Cancel is equivalent to Exit here. */
case NANO_CANCEL_KEY:
case 'E':
case 'e':
*kbinput = NANO_EXIT_KEY;
break;
}

View File

@@ -1922,7 +1922,7 @@ int main(int argc, char **argv)
}
}
/* If the executable filename starts with 'r', we use restricted
/* If the executable filename starts with 'r', enable restricted
* mode. */
if (*(tail(argv[0])) == 'r')
SET(RESTRICTED);

View File

@@ -204,7 +204,7 @@ char *parse_next_regex(char *ptr)
return NULL;
}
/* Null terminate and advance ptr. */
/* Null-terminate and advance ptr. */
*ptr++ = '\0';
while (isblank(*ptr))

View File

@@ -232,7 +232,7 @@ ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream)
*n += MAX_BUF_SIZE;
}
/* Null terminate the buffer. */
/* Null-terminate the buffer. */
null_at(lineptr, indx++);
*n = indx;

View File

@@ -1974,7 +1974,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
assert(alloc_len >= index + 1);
/* Null terminate converted. */
/* Null-terminate converted. */
converted[index] = '\0';
/* Make sure converted takes up no more than len columns. */