Skip to content

GitLab

Commit 88520c93 authored by Chris Allegretta's avatar Chris Allegretta
Browse files

Various spelling updates by David Lawrence Ramsey 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@639 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
parent a9434800
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 263 additions and 251 deletions
+263 -251
BUGS
View file @ 88520c93
......@@ -6,20 +6,20 @@
- edit_refresh() and update_line() do not handle selecting text when the
cursor is beyond COLS (10) [FIXED]
- no way to do a replace with the empty string (11) [FIXED, yay!]
- Spelling support is not elegant like pico's integration of the 'spell'
- Spelling support is not elegant like Pico's integration of the 'spell'
program. Nano only uses ispell (for now) (12) [FIXED]
- Moving to the end of a line when close to a multiple of COLS and at
least COLS * 2 does not make the screen jump early like it would for
if we were around COLS (bugs in edit_refresh, update_line) (13)
[FIXED, mostly]
- When at the very bottom of the edit window, do_wrap goes berzerk and
puts the curor somewhere bad, subsequent keystrokes crash the program
- When at the very bottom of the edit window, do_wrap goes berserk and
puts the cursor somewhere bad; subsequent keystrokes crash the program
(14) [FIXED, mostly]
- Doing a replacement of a substring of the replace string (e.g. replacing
"ed" with "fred" causes an infinite loop. (15) [FIXED]
"ed" with "fred" causes an infinite loop). (15) [FIXED]
- Cutting a file with marked text and both marker ends on the same line
causes a random segfault (16) [FIXED]
- Cutting more than one line resets the KEEP_CUTBUFFER flag in 0.9.3
- Cutting more than one line resets the KEEP_CUTBUFFER flag in 0.9.3.
Error is in bitwise assignment (nano.h). (17) [FIXED]
- The wrapping code does not work right for lines like the following:
* *
......@@ -27,9 +27,10 @@
- Nano fails to follow symlinks, even though -l isn't being used (20).
[Bug in global flag init, FIXED]
- When using --help or --version, the SIGINT character gets lost. (21) [FIXED]
- edit_refresh() and update_line() (and related functions), have
trouble when a tab is the character that is the boundry at COLS (23) [FIXED]
- there is an off-by-one error in keeping track of totsize. It is caused
- edit_refresh() and update_line() (and related functions) have
trouble when a tab is the character that is the boundary at COLS (23)
[FIXED]
- There is an off-by-one error in keeping track of totsize. It is caused
by the fact that we count the newline at the end when we read in a file
but we do not, in fact, display this newline. This should go away
implicitly when the "Magic Line" returns, but it is noted here for
......@@ -41,50 +42,52 @@
a dialog about not being able to write the file, and it will not let the
user exit (29, discovered by Joshua Jensen) [FIXED]
- Using nano -k, marked text is not cut properly. (31) [FIXED]
- Invoking -t or -k has the effect of invoking both option. (32) [FIXED]
- Invoking -t or -k has the effect of invoking both options. (32) [FIXED]
- totsize becomes incorrect after word-wrapping (25) [FIXED]
- Wrapping a line with autoindent mode sometimes causes a segfault (19)[FIXED]
- Wrapping a line with autoindent mode sometimes causes a segfault (19)
[FIXED]
- When inserting files, the display sometimes fails to display properly
until a pageup/down occurs (22)[FIXED]
- In search/replace code there is too much refreshing in bottomwin (26)
[FIXED]
until a pageup/down occurs (22) [FIXED]
- In search/replace code, there is too much refreshing in bottomwin (26)
[FIXED]
- In replace, there is no way to accept the default replace string. (27)
[FIXED]
[FIXED]
- Using nano -t, user can not exit until a filename is given via ^O. (30)
[FIXED]
[FIXED]
- totsize problems still abound in do_justify (33) [FIXED]
- Using -k cut text is not pasted properly. (34) [FIXED].
- Using -k pasted text is not updated properly if it goes beyond editbot. (35)
[FIXED]
- Doing a cut with -k can screw up the filestruct, fault is in cutting
- Using -k, cut text is not pasted properly. (34) [FIXED].
- Using -k, pasted text is not updated properly if it goes beyond editbot. (35)
[FIXED]
- Doing a cut with -k can screw up the filestruct; fault is in cutting
code. (36) [FIXED]
- Hitting enter on the magic line makes new lines, but they are not
written out to disk when saved..... (37). [FIXED]
- Page up and page down do not work the same way as Pico (# of lines). (38)
[FIXED]
- Page up and page down do not work the same way as in Pico (# of lines). (38)
[FIXED]
- When doing a search and the marker is set, the screen does not always
properly update the inverted text (39). [FIXED]
- Searches for a string that only exist on one line multiple times will
fail after finding the last occurance (discovered by Ken Tyler) (40). [FIXED]
- Alt-Z is current broken to toggle suspend. I guess I still don't know
- Searches for a string that only exists on one line multiple times will
fail after finding the last occurrence (discovered by Ken Tyler) (40).
[FIXED]
- Alt-Z is currently broken to toggle suspend. I guess I still don't know
signals very well =-) (41) [FIXED].
- Unable to cut the entire file using the marker (discovered by Kev Tyler)
(42). [FIXED]
- The keypad does not work when nano runs in the Gnome terminal (43). [FIXED]
- When reading in a file, if the file is a directory the contents of the
- When reading in a file, if the file is a directory, the contents of the
file being edited are blown away (discovered by Chris Pimlot) (44). [FIXED]
- in certain terms, nano will leave a "ghost" of screen upon exit
when called from inside mutt (among other settings) (45). [FIXED]
- In replace, hitting the Goto line shortcut key does nothing after a
search string is entered (discovered by Rocco Corsi) (46) [FIXED].
- When typing in a string in serahc or replace and hitting CASE_SENSITVE
- When typing in a string in search or replace and hitting CASE_SENSITIVE
or the other search string, the current string edit is blown away in
favor of the last stored search (47) [FIXED]
- If nano fails to open a file when it starts up,doing almost anything
- If nano fails to open a file when it starts up, doing almost anything
causes a segfault (discovered by Ben Roberts) (48). [FIXED]
- In certain terminals, nano would not work properly with keypad().
Turned out to be the silly timeout(0) call which is completely
unneeded anyway. (49) [FIXED]
Turned out to be the silly timeout(0) call, which is completely
unneeded, anyway. (49) [FIXED]
- With less than a page of text, doing a page down will move the
current line to the top of the screen, which it shouldn't do. (50)
[FIXED]
......@@ -97,7 +100,7 @@
- Cut to end cutting (-k) causes segfaults (try cutting "- Backup making
(filename~)?" line in TODO file) (discovered by
higuita@cadernoverde.com) (54) [FIXED].
- When using autoindent (-i), wrapped text does not get auto-indented
- When using autoindent (-i), wrapped text does not get autoindented
(55, discovered by Mark Senior) [FIXED].
- When using -R (regex) and -p (pico mode), subsequent searches after
the first fail if no string is entered (56) [FIXED].
......
ChangeLog
View file @ 88520c93
This diff is collapsed.
NEWS
View file @ 88520c93
......@@ -23,11 +23,11 @@
default list of shortcuts, "^G Get Help" is now Listed and
"^_ Goto Line" is not). The Yes/No/All keys have
finally been internationalized also. All in all, quite
a few changes considering nano is supposed to be in a code
freeze. But there are the usual helping of bugfixes, a
a few changes, considering nano is supposed to be in a code
freeze. But there are the usual helping of bugfixes, a
nasty bug when cutting text in -k mode and some
compatibility with older ncurses libraries have also been
fixed. All in all, a lot to see.
compatibility issues with older ncurses libraries have also
been fixed. All in all, a lot to see.
01/31/2001 - Nano 0.9.99pre2 is released. Not surprisingly, all that is
new is bugfixes, bugfixes, bugfixes. There were a few
......@@ -60,7 +60,7 @@
tab completion in certain instances. Have fun and Happy
New Year!
12/18/2000 - Nano 0.9.24 is released. This versions contains the last of
12/18/2000 - Nano 0.9.24 is released. This version contains the last of
the security fixes for writing files, as well as for a
nasty segfault when nano is unable to open a file for
reading, among other fixes. Nano also now cowardly
......@@ -74,7 +74,7 @@
12/08/2000 - Nano 0.9.23 is the "race conditions bite" release. The
main reason for this release is the less-than-optimal
fix for the security issue in nano with following symbolic
links. Hopefully this will fix the probelm permanently.
links. Hopefully this will fix the problem permanently.
The --nofollow option also works again for those who
are real security nuts. There are also some display and
search fixes, and the --disable-spell function was renamed
......@@ -114,10 +114,10 @@
(courtesy of Mr. Rocco Corsi) and tab completion when
reading in or writing out files! There's also the usual
billion or so bug fixes. Feedback on this release is
welcome because so much much has changed, especially with
the previous string display in search and replace. Email
-> nano@nano-editor.org <-. If you like something, don't
like something, or just want to order a pizza, let us know!
welcome because so much has changed, especially with the
previous string display in search and replace. Email ->
nano@nano-editor.org <-. If you like something, don't like
something, or just want to order a pizza, let us know!
10/02/2000 - Nano 0.9.19 is the "Chris is getting married in less than
a week and needs a distraction" release. There are only
......@@ -143,16 +143,16 @@
flags (M-c, M-i, M-z, M-x, M-p, M-w, M-m, M-k and M-e for
-c, -i, -x, -p, -w, -k, and -R).
08/09/2000 - Nano 0.9.16, after some struggling, is release. This release
08/09/2000 - Nano 0.9.16, after some struggling, is released. This release
should fix a few of the holes that 0.9.15 dug. The
"cutting text on the first line" bug is fixed, as is the
"cutting text on the last line" bug. Nice symmetry there
huh? Also the --tabsize argument should now work as well
as by using -T.
08/03/2000 - Nano 0.9.15 is the "I cant think of a release description"
08/03/2000 - Nano 0.9.15 is the "I can't think of a release description"
release. There are the usual gala of display bugfixes,
a for the the nasty bug in -k mode that could create a
a fix for the the nasty bug in -k mode that could create a
loop in the file being edited, and some other code
cleanup. Also, the -T option should now work regardless
of the curses library used. Yay.
......@@ -161,7 +161,7 @@
be skipped as a version number" release. One typo
caused unending problems (calling nano with either -t or
-k caused both flags to be used). The -k code is also now
closer in functionality to Pico's -k mode, please
closer in functionality to Pico's -k mode; please
note that this code is not finished yet. Working on this
code has made me realize that there is not enough
abstraction in the code, and I will be working on that
......@@ -170,7 +170,7 @@
07/23/2000 - Nano 0.9.13 has a few new bits and bobs, most notably the
-k option from Pico (cut to end of line). The majority
of changes in this release are bugfixes however, including
of changes in this release are bugfixes, however, including
the usual display fixes and fixes for writing to symbolic
links and un-writeable files. Barring any other major
changes, this should be the feature set for nano 1.0,
......@@ -179,12 +179,12 @@
07/07/2000 - Nano 0.9.12 (The "lucky day" release) is bursting with new
features, bug fixes, and yummy fruit flavor. For
changes, the alternate replace keystroke ^W^T is now
^W^R to be compatible with later version of Pico.
^W^R to be compatible with later versions of Pico.
^W^T is now goto line, again for Pico compatibility.
As for new features, the wonderful/hated magic line
code has returned with a vengeance! Also, regular
expression searches and replaces have been incorporated
via the -R flag. And of course there are the usual
via the -R flag. And, of course, there are the usual
helping of display and other bug fixes to top it all
off.
......@@ -198,8 +198,8 @@
this function just changes the way tabs LOOK in the
editor, the tabs you input are still real tabs of normal
width (usually 8 characters); nano just makes them look
smaller or bigger whlie in the editor. New in the
translation department is an indonesian translation (id).
smaller or bigger while in the editor. New in the
translation department is an Indonesian translation (id).
06/06/2000 - Nano 0.9.10 is primarily a bugfix for the loss of SIGINT when
using "run and terminate" flags (for example, --help).
......@@ -218,7 +218,7 @@
the resize crash people have been experiencing. It also
offers a new input method that should allow nano to do
things the right way (like ^S, ^Q, custom suspend keys)
and hopefully wont break with non-US keyboards. There
and hopefully won't break with non-US keyboards. There
are also the obligatory display fixes and speedups. Have
fun with it.
......@@ -239,7 +239,7 @@
05/01/2000 - Nano 0.9.5 attempts to speed up the display of text
to be at least somewhat reasonable. Much
code profiling has been done to reduce the
rediculous number of redundant display updates. This
ridiculous number of redundant display updates. This
will probably expose a lot of bugs that can then be
fixed, so this release is probably not for the faint
of heart. For anyone curious, I would call nano 0.9.2
......@@ -265,7 +265,7 @@
so it is being removed for the time being, and perhaps
indefinitely.
Other new stuff includes a --emable-tiny option to make
Other new stuff includes an --enable-tiny option to make
nano ultra small (disabling i18n, detailed help and the
marker and mouse code), and --with-slang to use the
slang libraries instead of ncurses.
......@@ -292,7 +292,7 @@
04/07/2000 - Nano 0.9.0 has some updates, new language support and
a much better refresh setup (It's still not great, but...)
There should also be more stabillity editing long lines,
There should also be more stability editing long lines,
as there was a stupid mistake in the update_line
call. Silly me =)
......@@ -301,13 +301,13 @@
Most things work, the rest doesn't doesn't work because
(a) I can't fix it or I would have already done so, and
(b) the amount of patches I'm receiving right now is quite
negligible. Forrunately this release marks the first
negligible. Fortunately, this release marks the first
release since I have acquired ownership of the nano pages
on SourceForge. Here's hoping SF will get us some more
visibilitiy, translators and patches.
visibility, translators and patches.
03/12/2000 - After a hiatus, I have finally moved (not unpacked though)
to my new home into albany. Thus I should now have more
to my new home into Albany. Thus I should now have more
time to work on nano. Nano 0.8.8, the "dear god what
broke this time?" release, incorporates patches for both
i18n and many bugfixes. It is VERY likely something broke
......@@ -316,8 +316,8 @@
I would like to announce that I'm going to need
translations soonish, so if you are fluent in other
languages than english (or even better, if your native
language is not english) and you would like to submit a
languages than English (or even better, if your native
language is not English) and you would like to submit a
translation file to me, please feel free to do so. If you
do, I will list your name and email in the AUTHORS file as
the maintainer of the .po file, and from then on it is
......@@ -325,9 +325,9 @@
03/01/2000 - Well, to continue my trend of going back on my previous
release's comments, nano 0.8.7 is released. The crashing
behavior was still occuring, and this most recent fix also
behavior was still occurring, and this most recent fix also
fixes some other wrapping problems, so here you go.
There may be another relase soon, there may not be, is
There may be another release soon, there may not be, is
that vague enough? =)
02/25/2000 - More minor bugfixes in 0.8.6, the bizarre behavior at the end
......@@ -354,11 +354,11 @@
but I may be changing jobs very soon. I will release
version 0.8.2 as is (no i18n, no help menu (yet). I
expect things to settle down by the end of next week, and
then I can try to start on the i18n support and help menu,
then I can try to start on the i18n support and help menu;
look for these new features in version 0.8.5 to 0.9.0.
01/28/2000 - Nano 0.8.1 marks our first official step toward
internationaliation (i18n) and the help system (^G). I
internationalization (i18n) and the help system (^G). I
will be merging in Jordi's patches for initial i18n in the
next version, and will implement the help system with
i18n built into it shortly after that. Please don't
......@@ -367,14 +367,14 @@
01/25/2000 - Nano 0.8.0 is officially the 'let's try and be at least a
little portable, mmmmkay?' release. There are many
portability checks and fixes, many thanks to Andy Kahn for
portability checks and fixes; many thanks to Andy Kahn for
his patches. I removed the broken do_spell behavior with
the 'spell' program, for now we only try to call 'ispell'
the 'spell' program; for now, we only try to call 'ispell'
until I write a better method to handle the output of the
normal 'spell' command.
01/24/2000 - Nano 0.7.9 features many new features. Among them are a
new autoindent feature (-i, --autoondent), tempfile
new autoindent feature (-i, --autoindent), tempfile
flag like Pico's -t flag (-t, --tempfile), and preliminary
spelling program support. The spelling function tries
to run 'spell' and then 'ispell' in that order, but you
......@@ -387,7 +387,7 @@
all the changes in this release will cause a few bugs, so
0.7.8 will primarily be about fixing those bugs.
Things added this release include resizeability (kinda),
Things added this release include resizability (kinda),
new -x and -c flags (see nano -h for help), long command
line flag support, and the usual array of bugfixes.
......
README
View file @ 88520c93
......@@ -11,10 +11,10 @@ Overview
redistribution. Because of this, Pine and Pico are not included with
many GNU/Linux distributions. Also, other features (like goto line
number or search and replace) were unavailable until recently or
require a command-line flag. Yuck.
require a command line flag. Yuck.
nano aims to solve these problems by emulating the functionality of
Pico as closely as possible while adressing the problems above and
Pico as closely as possible while addressing the problems above and
perhaps providing other extra functionality.
The nano editor is now an official GNU package. For more information
......@@ -29,7 +29,7 @@ How to compile and install nano
make
make install
It's that simple. Use --prefix with configutr to override the
It's that simple. Use --prefix with configure to override the
default installation directory of /usr/local.
Web Page
......
TODO
View file @ 88520c93
......@@ -25,7 +25,7 @@ For Next Version:
- .nanorc ?????
- Backup making (filename~)?
- Search (etc) string history [1.1]
- Implent Pico's -j and -g flags, as they are pretty easy to do.
- Implement Pico's -j and -g flags, as they are pretty easy to do.
- Make mouse support work with clicking on the shortcuts (-m). Must
make global variable pointing to current shortcut list to determine what
keystroke to ungetch().
......
cut.c
View file @ 88520c93
......@@ -104,7 +104,7 @@ void cut_marked_segment(filestruct * top, int top_x, filestruct * bot,
/* We explicitly don't decrement totlines here because we don't snarf
* up a newline when we're grabbing the last line of the mark. For
* the same reason we don't do an extra totsize decrement */
* the same reason, we don't do an extra totsize decrement. */
add_to_cutbuffer(bot);
top->next = next;
......@@ -116,7 +116,7 @@ void cut_marked_segment(filestruct * top, int top_x, filestruct * bot,
current = top;
current_x = top_x;
/* If we're hitting the end of the buffer we should clean that up. */
/* If we're hitting the end of the buffer, we should clean that up. */
if (bot == filebot) {
if (next != NULL) {
filebot = next;
......@@ -335,7 +335,7 @@ int do_uncut_text(void)
newend->next = tmp;
/* If tmp isn't null, we're in the middle: update the
* prev pointer. If it IS null, we're at the end, update
* prev pointer. If it IS null, we're at the end; update
* the filebot pointer */
if (tmp != NULL)
......
faq.html
View file @ 88520c93
......@@ -24,7 +24,7 @@ nano?</a></font>
TIP?</a></font>
<br><font color="#330000"><a href="#1.6">1.6. What is the current version
of nano?</a></font>
<br><font color="#330000"><a href="#1.7">1.7. I want to read the man page
<br><font color="#330000"><a href="#1.7">1.7. I want to read the manpage
without having to download the program!</a></font></blockquote>
<h2>
......@@ -552,7 +552,7 @@ both, i.e. distribute modified binaries.</blockquote>
should I use then?</font></h2>
<blockquote><font color="#330000"> If you are looking to use a Free
Software program similar to PINE and emacs is not your things, you should
Software program similar to PINE and emacs is not your thing, you should
definitely take a look at <a href="http://www.mutt.org">mutt</a>.&nbsp; It
is a full-screen, console based mail program that actually has a lot more
flexibility than Pine, but has a keymap included in the distribution that
......
files.c
View file @ 88520c93
......@@ -161,7 +161,7 @@ int read_file(int fd, char *filename)
/* Now we allocate a bigger buffer 128 characters at a time.
If we allocate a lot of space for one line, we may indeed
have to use a buffer this big later on, so we don't
decrease it at all. We do free it at the end though. */
decrease it at all. We do free it at the end, though. */
if (i >= bufx - 1) {
buf = nrealloc(buf, bufx + 128);
......@@ -301,7 +301,7 @@ int do_insertfile(void)
/* Here we want to rebuild the edit window */
fix_editbot();
/* If we've gone off the bottom, recenter, otherwise just redraw */
/* If we've gone off the bottom, recenter; otherwise, just redraw */
if (current->lineno > editbot->lineno)
edit_update(current, CENTER);
else
......@@ -320,7 +320,7 @@ int do_insertfile(void)
/*
* Write a file out. If tmp is nonzero, we set the umask to 0600,
* we don't set the global variable filename to it's name, and don't
* we don't set the global variable filename to its name, and don't
* print out how many lines we wrote on the statusbar.
*
* tmp means we are writing a tmp file in a secure fashion. We use
......@@ -452,7 +452,7 @@ int write_file(char *name, int tmp)
if (realexists == -1 || tmp ||
(!ISSET(FOLLOW_SYMLINKS) && S_ISLNK(lst.st_mode))) {
/* Use default umask as file permisions if file is a new file. */
/* Use default umask as file permissions if file is a new file. */
mask = umask(0);
umask(mask);
......@@ -611,7 +611,7 @@ char *real_dir_from_tilde(char *buf)
}
else {
/* Figure how how much of of the str we need to compare */
/* Figure how how much of the str we need to compare */
for (i = 1; buf[i] != '/' && buf[i] != 0; i++)
;
......@@ -749,7 +749,7 @@ char **cwd_tab_completion(char *buf, int *num_matches)
#ifdef PATH_MAX
if ((dirName = getcwd(NULL, PATH_MAX+1)) == NULL)
#else
/* The better, but aparently segfault-causing way */
/* The better, but apparently segfault-causing way */
if ((dirName = getcwd(NULL, 0)) == NULL)
#endif /* PATH_MAX */
return matches;
......@@ -900,7 +900,7 @@ char *input_tab(char *buf, int place, int *lastWasTab, int *newplace)
break;
default:
/* Check to see if all matches share a beginning, and if so
/* Check to see if all matches share a beginning, and, if so,
tack it onto buf and then beep */
if (strcmp(buf, "") && strstr(buf, "/")) {
......@@ -1080,7 +1080,7 @@ char **browser_init(char *path, int *longest, int *numents)
return filelist;
}
/* Free our malloced memory */
/* Free our malloc()ed memory */
void free_charptrarray(char **array, int len)
{
int i;
......@@ -1090,7 +1090,7 @@ void free_charptrarray(char **array, int len)
free(array);
}
/* only print the last part of a path, isn't there a shell
/* only print the last part of a path; isn't there a shell
command for this? */
char *tail(char *foo)
{
......@@ -1157,7 +1157,7 @@ char *do_browser(char *inpath)
filelist = browser_init(path, &longest, &numents);
foo = nmalloc(longest + 8);
/* Sort the list by directory first then alphabetically */
/* Sort the list by directory first, then alphabetically */
qsort(filelist, numents, sizeof(char *), diralphasort);
kb = keypad_on(edit, 1);
......@@ -1178,7 +1178,7 @@ char *do_browser(char *inpath)
editline = 0;
col = 0;
/* Compute line number we're on now so we don't divide by zero later */
/* Compute line number we're on now, so we don't divide by zero later */
if (width == 0)
lineno = selected;
else
......@@ -1351,8 +1351,8 @@ char *do_browser(char *inpath)
col += strlen(foo);
/* Put file info in the string also */
/* We use lstat here to detect links, then if we find a
symlink we examine it via stat() to see if it is a
/* We use lstat here to detect links; then, if we find a
symlink, we examine it via stat() to see if it is a
directory or just a file symlink */
lstat(filelist[j], &st);
if (S_ISDIR(st.st_mode))
......@@ -1426,7 +1426,7 @@ char *do_browser(char *inpath)
return retval;
}
/* Browser front end, checks to see if inpath has a dir in it and if so
/* Browser front end, checks to see if inpath has a dir in it and, if so,
starts do_browser from there, else from the current dir */
char *do_browse_from(char *inpath)
{
......@@ -1436,7 +1436,7 @@ char *do_browse_from(char *inpath)
tmp = mallocstrcpy(tmp, inpath);
/* If there's no / in the string, we may was well start from . */
/* If there's no / in the string, we may as well start from . */
if (tmp == NULL || *tmp == '\0' || !strstr(tmp, "/")) {
#ifdef PATH_MAX
char *from = getcwd(NULL, PATH_MAX+1);
......
global.c
View file @ 88520c93
......@@ -35,7 +35,7 @@
/*
* Global variables
*/
int flags = 0; /* Our new flag containig many options */
int flags = 0; /* Our new flag containing many options */
WINDOW *edit; /* The file portion of the editor */
WINDOW *topwin; /* Top line of screen */
WINDOW *bottomwin; /* Bottom buffer */
......@@ -57,7 +57,7 @@ filestruct *cutbuffer = NULL; /* A place to store cut text */
char *answer = NULL; /* Answer str to many questions */
int totlines = 0; /* Total number of lines in the file */
int totsize = 0; /* Total number of bytes in the file */
int placewewant = 0; /* The collum we'd like the cursor
int placewewant = 0; /* The column we'd like the cursor
to jump to when we go to the
next or previous line */
......@@ -209,7 +209,7 @@ void shortcut_init(int unjustify)
nano_nextpage_msg = _("Move to the next screen");
nano_cut_msg = _("Cut the current line and store it in the cutbuffer");
nano_uncut_msg = _("Uncut from the cutbuffer into the current line");
nano_cursorpos_msg = _("Show the posititon of the cursor");
nano_cursorpos_msg = _("Show the position of the cursor");
nano_spell_msg = _("Invoke the spell checker (if available)");
nano_up_msg = _("Move up one line");
nano_down_msg = _("Move down one line");
......
move.c
View file @ 88520c93
......@@ -56,7 +56,7 @@ int page_down(void)
if (current == filebot)
return 0;
/* AHEM, if we only have a screen or less of text, DONT do an
/* AHEM, if we only have a screen or less of text, DON'T do an
edit_update, just move the cursor to editbot! */
if (edittop == fileage && editbot == filebot && totlines < editwinrows) {
current = editbot;
......
nano.1
View file @ 88520c93
......@@ -23,7 +23,7 @@ This manual page documents briefly the
command.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
.\" respectively.
\fBnano\fP is a small, free and friendly editor which aims to replace
Pico, the default editor included in the non-free Pine package. Rather
......@@ -44,7 +44,7 @@ Enable regular expression matching for search strings, as well as
Show the current version number and author.
.TP
.B \-h (\-\-help)
Display a summary of commandline options.
Display a summary of command line options.
.TP
.B \-c (\-\-const)
Constantly show the cursor position.
......@@ -58,7 +58,7 @@ Enable cut from cursor to end of line with ^K.
.TP
.B \-l (\-\-nofollow)
If the file being edited is a symbolic link, replace the link with a
a new file, do not follow it. Good for editing files in /tmp perhaps?
a new file, do not follow it. Good for editing files in /tmp, perhaps?
.TP
.B \-m (\-\-mouse)
Enable mouse support (if available for your system).
......@@ -69,14 +69,14 @@ at the bottom of the screen, as well as the display and entry of previous
search and replace strings.
.TP
.B \-r (\-\-fill)
Wrap lines at column #cols. By default this is the width of the screen,
Wrap lines at column #cols. By default, this is the width of the screen,
less eight.
.TP
.B \-s (\-\-speller)
Enable alternative spell checker command.
.TP
.B \-t (\-\-tempfile)
Always save changed buffer without prompting. Same as Pico -t option.
Always save changed buffer without prompting. Same as Pico -t option.
.TP
.B \-v (\-\-view)
View file (read only) mode.
......@@ -97,10 +97,10 @@ Ignored, for compatibility with Pico.
Places cursor at LINE on startup.
.SH NOTES
Nano will try to dump the buffer into an emergency file in some cases.
Mainly, this will happen if Nano recieves a SIGHUP or runs out of
Mainly, this will happen if Nano receives a SIGHUP or runs out of
memory, when it will write the buffer into a file named "nano.save" if the
buffer didn't have a name already, or will add a ".save" suffix to the
current finename. Nano will \fBnot\fP write this file if a previous one
current filename. Nano will \fBnot\fP write this file if a previous one
exists in the current directory.
.SH BUGS
Please send any comments or bug reports to
......
nano.1.html
View file @ 88520c93
......@@ -60,7 +60,7 @@ Show the current version number and author.
<DT><B>-h (--help)</B>
<DD>
Display a summary of commandline options.
Display a summary of command line options.
<DT><B>-c (--const)</B>
<DD>
......@@ -78,7 +78,7 @@ Enable cut from cursor to end of line with ^K.
<DD>
If the file being edited is a symbolic link, replace the link with a
a new file, do not follow it. Good for editing files in /tmp perhaps?
a new file, do not follow it. Good for editing files in /tmp, perhaps?
<DT><B>-m (--mouse)</B>
<DD>
......@@ -92,7 +92,7 @@ search and replace strings.
<DT><B>-r (--fill)</B>
<DD>
Wrap lines at column #cols. By default this is the width of the screen,
Wrap lines at column #cols. By default, this is the width of the screen,
less eight.
<DT><B>-s (--speller)</B>
......@@ -101,7 +101,7 @@ Enable alternative spell checker command.
<DT><B>-t (--tempfile)</B>
<DD>
Always save changed buffer without prompting. Same as Pico -t option.
Always save changed buffer without prompting. Same as Pico -t option.
<DT><B>-v (--view)</B>
<DD>
......@@ -131,10 +131,10 @@ Places cursor at LINE on startup.
<H2>NOTES</H2>
Nano will try to dump the buffer into an emergency file in some cases.
Mainly, this will happen if Nano recieves a SIGHUP or runs out of
Mainly, this will happen if Nano receives a SIGHUP or runs out of
memory, when it will write the buffer into a file named &quot;nano.save&quot; if the
buffer didn't have a name already, or will add a &quot;.save&quot; suffix to the
current finename. Nano will <B>not</B> write this file if a previous one
current filename. Nano will <B>not</B> write this file if a previous one
exists in the current directory.
<A NAME="lbAG">&nbsp;</A>
<H2>BUGS</H2>
......
nano.c
View file @ 88520c93
......@@ -66,7 +66,7 @@
int fill = 0; /* Fill - where to wrap lines, basically */
struct termios oldterm; /* The user's original term settings */
static struct sigaction act; /* For all out fun signal handlers */
static struct sigaction act; /* For all our fun signal handlers */
#ifndef DISABLE_HELP
static char *help_text_init = ""; /* Initial message, not including shortcuts */
......@@ -629,7 +629,7 @@ int do_enter(filestruct * inptr)
/* The logic here is as follows:
* -> If we are at the bottom of the buffer, we want to recenter
* (read: rebuild) the screen and forcably move the cursor.
* (read: rebuild) the screen and forcibly move the cursor.
* -> otherwise, we want simply to redraw the screen and update
* where we think the cursor is.
*/
......@@ -1002,7 +1002,7 @@ void do_wrap(filestruct * inptr, char input_char)
totlines++;
/* Everything about it makes me want this line here but it causes
/* Everything about it makes me want this line here, but it causes
* totsize to be high by one for some reason. Sigh. (Rob) */
/* totsize++; */
......@@ -1066,7 +1066,7 @@ void check_wrap(filestruct * inptr, char ch)
#endif /* DISABLE_WRAPPING */
/* Stuff we do when we abort from programs and want to clean up the
* screen. This doesnt do much right now.
* screen. This doesn't do much right now.
*/
void do_early_abort(void)
{
......@@ -1420,7 +1420,7 @@ int do_alt_speller(char *file_name)
/* Start a new process for the alternate speller */
if ((pid_spell = fork()) == 0) {
/* Start alternate spell program, we are using the PATH here!?!? */
/* Start alternate spell program; we are using the PATH here!?!? */
execvp(spellargs[0], spellargs);
/* Should not be reached, if alternate speller is found!!! */
......@@ -1725,7 +1725,7 @@ void handle_sigwinch(int s)
void signal_init(void)
{
/* Trap SIGINT and SIGQUIT cuz we want them to do useful things. */
/* Trap SIGINT and SIGQUIT cuz we want them to do useful things. */
memset(&act, 0, sizeof(struct sigaction));
act.sa_handler = SIG_IGN;
sigaction(SIGINT, &act, NULL);
......@@ -1741,7 +1741,7 @@ void signal_init(void)
}
/* Trap SIGHUP cuz we want to write the file out. */
/* Trap SIGHUP cuz we want to write the file out. */
act.sa_handler = handle_hup;
sigaction(SIGHUP, &act, NULL);
......@@ -1755,7 +1755,7 @@ void window_init(void)
if ((editwinrows = LINES - 5 + no_help()) < MIN_EDITOR_ROWS)
die_too_small();
/* Setup up the main text window */
/* Set up the main text window */
edit = newwin(editwinrows, COLS, 2, 0);
/* And the other windows */
......@@ -2009,7 +2009,7 @@ int do_justify(void)
display_main_list();
reset_cursor();
/* Now get a keystroke and see if it's unjustify, if not unget the keytroke
/* Now get a keystroke and see if it's unjustify; if not, unget the keystroke
and return */
if ((kbinput = wgetch(edit)) != NANO_UNJUSTIFY_KEY) {
ungetch(kbinput);
......@@ -2027,7 +2027,7 @@ int do_justify(void)
if (tmptop->prev == NULL)
edit_refresh();
/* Restore totsize from befure justify */
/* Restore totsize from before justify */
totsize = totbak;
free_filestruct(tmptop);
blank_statusbar_refresh();
......@@ -2163,8 +2163,8 @@ void do_toggle(int which)
#endif
}
/* If the NumLock key has made the keypad gone awry, print an error
message, hopefully we can address it later. */
/* If the NumLock key has made the keypad go awry, print an error
message; hopefully we can address it later. */
void print_numlock_warning(void)
{
static int didmsg = 0;
......@@ -2415,7 +2415,7 @@ int main(int argc, char *argv[])
#ifdef DEBUG
fprintf(stderr, _("Main: bottom win\n"));
#endif
/* Set up up bottom of window */
/* Set up bottom of window */
display_main_list();
#ifdef DEBUG
......@@ -2529,7 +2529,7 @@ int main(int argc, char *argv[])
wgetch(edit);
break;
case 126: /* Hack, make insert key do something
usefile, like insert file */
useful, like insert file */
do_insertfile();
keyhandled = 1;
break;
......
nano.h
View file @ 88520c93
......@@ -85,7 +85,7 @@ typedef struct shortcut {
typedef struct toggle {
int val; /* Sequence to toggle the key. Should only need 1 */
char *desc; /* Description for when toggle is, uh, toggled,
e.g. "Pico Messages", we'll append Enabled or
e.g. "Pico Messages"; we'll append Enabled or
Disabled */
int flag; /* What flag actually gets toggled */
} toggle;
......@@ -120,7 +120,7 @@ typedef struct rcoption {
#define CUT_TO_END (1<<17)
#define DISABLE_CURPOS (1<<18)
/* Control key sequences, chaning these would be very very bad */
/* Control key sequences, changing these would be very very bad */
#define NANO_CONTROL_A 1
#define NANO_CONTROL_B 2
......@@ -181,7 +181,7 @@ typedef struct rcoption {
#define NANO_ALT_Y 'y'
#define NANO_ALT_Z 'z'
/* Some semi-changeable keybindings, dont play with unless you're sure you
/* Some semi-changeable keybindings; don't play with unless you're sure you
know what you're doing */
#define NANO_INSERTFILE_KEY NANO_CONTROL_R
......
nano.info
View file @ 88520c93
......@@ -69,7 +69,7 @@ Command Line Options
Print the version number and copyright and quit.
`-c, --const'
Constantly display the cursor posititon and line number on the
Constantly display the cursor position and line number on the
statusbar.
`-h, --help'
......@@ -115,7 +115,7 @@ Command Line Options
well, as in Expert Mode it is located at the very bottom of the
editor.
Note: When accesing the help system, Expert Mode is temporarily
Note: When accessing the help system, Expert Mode is temporarily
disabled to display the help system navigation keys.
`-v, --view'
......@@ -165,7 +165,7 @@ Special Functions
=================
Special functions use the Control key (displayed in the help and
shotcut lists as ^) or the Meta key (displayed as M).
shortcut lists as ^) or the Meta key (displayed as M).
* Control key sequences are entered by holding down the Control key
and pressing the desired letter.
......@@ -189,7 +189,7 @@ are three sections: left, center and right. The section on the left
displays the version of `nano' being used. The center section displays
the current file name, or "New Buffer" if the file has not yet been
named. The section on the right will display "Modified" if the file
has been modified since it ws last saved or opened.
has been modified since it was last saved or opened.
Special modes: When nano is in "File browser" mode, the center
section will display the current directory instead of the filename.
......@@ -207,8 +207,8 @@ The Statusbar
The Statusbar shows important and informational messages. Any error
messages that occur from using the editor will appear on the statusbar.
Any questions that are asked of the user will be asked on the statusbar,
and any user input (serch strings, file names, etc) will be input on the
statusbar.
and any user input (search strings, file names, etc) will be input on
the statusbar.

File: nano.info, Node: Shortcut Lists, Prev: The Statusbar, Up: Editor Basics
......@@ -216,7 +216,7 @@ File: nano.info, Node: Shortcut Lists, Prev: The Statusbar, Up: Editor Basics
Shortcut Lists
==============
The Shorcut Lists are the two lines at the bottom of the screen
The Shortcut Lists are the two lines at the bottom of the screen
which show some of the more commonly used functions in the editor. The
exact functions which are displayed depend on whether Pico
Compatibility Mode mode is enabled. *Note Pico Compatibility::, for
......@@ -278,14 +278,14 @@ File: nano.info, Node: The File Browser, Next: Pico Compatibility, Prev: Feat
The File Browser
****************
When reading or writilg files, pressing ^T will invoke the file
When reading or writing files, pressing ^T will invoke the file
browser. Here, one can navigate directories in a graphical manner in
order to find the desired file.
Basic movement in the file browser is accomplished with he arrow keys
and page up/down. The behavior of the enter (or 's') key varies by what
is currently selected. If the currently selected object is a directory,
the file browser will enter and display the contects of the directory.
the file browser will enter and display the contents of the directory.
If the object is a file, this filename and path are copied to the
statusbar and the file browser is exited.
......@@ -362,10 +362,10 @@ consider the following command line options:
Disable the justify (^J)/unjustify (^U) functions in the editor.
`--disable-speller'
Disables spell checker abillity.
Disables spell checker ability.
`--disable-help'
Disables the help function (^G). Disabling this option maks the
Disables the help function (^G). Disabling this option makes the
binary much smaller, but makes it difficult for new users to learn
more than very basic things about using the editor.
......@@ -393,17 +393,17 @@ Node: Top199
Node: Introduction507
Node: Overview933
Node: Command Line Options1513
Ref: Expert Mode3236
Ref: Expert Mode3235
Node: Editor Basics4078
Node: Entering Text4303
Node: Special Functions4643
Node: The Titlebar5497
Node: The Statusbar6194
Node: Shortcut Lists6774
Node: Online Help7166
Node: Feature Toggles7542
Node: The File Browser8685
Node: Pico Compatibility9394
Node: Building and Configure Options11436
Node: The Titlebar5498
Node: The Statusbar6196
Node: Shortcut Lists6777
Node: Online Help7170
Node: Feature Toggles7546
Node: The File Browser8689
Node: Pico Compatibility9398
Node: Building and Configure Options11440

End Tag Table
nano.texi
View file @ 88520c93
......@@ -118,7 +118,7 @@ Turns on regular expression search and search/replace.
Print the version number and copyright and quit.
@item -c, --const
Constantly display the cursor posititon and line number on the statusbar.
Constantly display the cursor position and line number on the statusbar.
@item -h, --help
Print the usage and exit.
......@@ -163,7 +163,7 @@ In Expert Mode, the Shortcut Lists will not appear at the bottom of the
screen. This affects the location of the statusbar as well, as in Expert
Mode it is located at the very bottom of the editor.
Note: When accesing the help system, Expert Mode is temporarily disabled
Note: When accessing the help system, Expert Mode is temporarily disabled
to display the help system navigation keys.
@item -v, --view
......@@ -205,7 +205,7 @@ edited.
@section Special Functions
Special functions use the Control key (displayed in the help and
shotcut lists as ^) or the Meta key (displayed as M).
shortcut lists as ^) or the Meta key (displayed as M).
@itemize @bullet
......@@ -230,7 +230,7 @@ three sections: left, center and right. The section on the left displays
the version of @code{nano} being used. The center section displays the
current file name, or "New Buffer" if the file has not yet been named.
The section on the right will display "Modified" if the file has been
modified since it ws last saved or opened.
modified since it was last saved or opened.
Special modes: When nano is in "File browser" mode, the center section
will display the current directory instead of the filename.
......@@ -245,13 +245,13 @@ bottom line in Expert Mode. @xref{Expert Mode}, for more info.
The Statusbar shows important and informational messages. Any error
messages that occur from using the editor will appear on the statusbar.
Any questions that are asked of the user will be asked on the statusbar,
and any user input (serch strings, file names, etc) will be input on the
and any user input (search strings, file names, etc) will be input on the
statusbar.
@node Shortcut Lists, , The Statusbar, Editor Basics
@section Shortcut Lists
The Shorcut Lists are the two lines at the bottom of the screen which show
The Shortcut Lists are the two lines at the bottom of the screen which show
some of the more commonly used functions in the editor. The exact
functions which are displayed depend on whether Pico Compatibility Mode mode
is enabled. @xref{Pico Compatibility}, for more info.
......@@ -308,14 +308,14 @@ toggles the -z (--suspend) command line flag.
@node The File Browser, Pico Compatibility, Feature Toggles, Top
@chapter The File Browser
When reading or writilg files, pressing ^T will invoke the file browser.
When reading or writing files, pressing ^T will invoke the file browser.
Here, one can navigate directories in a graphical manner in order to find
the desired file.
Basic movement in the file browser is accomplished with he arrow keys
and page up/down. The behavior of the enter (or 's') key varies by what
is currently selected. If the currently selected object is a directory,
the file browser will enter and display the contects of the directory. If
the file browser will enter and display the contents of the directory. If
the object is a file, this filename and path are copied to the statusbar
and the file browser is exited.
......@@ -389,10 +389,10 @@ Disable the tab completion code when reading or writing files.
Disable the justify (^J)/unjustify (^U) functions in the editor.
@item --disable-speller
Disables spell checker abillity.
Disables spell checker ability.
@item --disable-help
Disables the help function (^G). Disabling this option maks the
Disables the help function (^G). Disabling this option makes the
binary much smaller, but makes it difficult for new users
to learn more than very basic things about using the editor.
......
po/ca.po
View file @ 88520c93
......@@ -222,7 +222,7 @@ msgid "Uncut from the cutbuffer into the current line"
msgstr "Enganxar el cutbuffer a la lnia actual"
#: global.c:212
msgid "Show the posititon of the cursor"
msgid "Show the position of the cursor"
msgstr "Mostrar la posici del cursor"
#: global.c:213
......
po/cs.po
View file @ 88520c93
......@@ -223,7 +223,7 @@ msgid "Uncut from the cutbuffer into the current line"
msgstr "Vlo z cutbufferu do aktuln dky"
#: global.c:212
msgid "Show the posititon of the cursor"
msgid "Show the position of the cursor"
msgstr "Uka pozici kurzoru"
#: global.c:213
......
po/de.po
View file @ 88520c93
......@@ -223,7 +223,7 @@ msgid "Uncut from the cutbuffer into the current line"
msgstr "Aus der Zwischenablage einfgen"
#: global.c:212
msgid "Show the posititon of the cursor"
msgid "Show the position of the cursor"
msgstr "Cursoposition anzeigen"
#: global.c:213
......
po/es.po
View file @ 88520c93
......@@ -222,7 +222,7 @@ msgid "Uncut from the cutbuffer into the current line"
msgstr "Pegar el cutbuffer en la lnea actual"
#: global.c:212
msgid "Show the posititon of the cursor"
msgid "Show the position of the cursor"
msgstr "Mostrar la posicin del cursor"
#: global.c:213
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment