Commit Graph

2244 Commits

Author SHA1 Message Date
David Lawrence Ramsey
cf4db89d56 in help_line_len(), make the text display more flexible, and closer to
what nano 1.2.x does


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2418 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-22 03:59:32 +00:00
David Lawrence Ramsey
4e0b1ae332 add missing space in the help text, and fix an allocsize-related assert
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2417 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-22 03:58:51 +00:00
David Lawrence Ramsey
c4daf5d49e in help_init(), when calculating allocsize, take multibyte characters
into account, and keep the column number limits consistent


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2416 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-22 02:51:01 +00:00
David Lawrence Ramsey
b41df4a140 comment fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2415 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-22 02:50:24 +00:00
David Lawrence Ramsey
a853e2d650 in do_justify(), move break_pos after the space earlier, as do_wrap()
does with wrap_loc, as it's more efficient


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2414 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-22 02:17:36 +00:00
David Lawrence Ramsey
6b94e95ec9 in find_paragraph(), fix a problem where a search for the next paragraph
would skip over certain cases of one-line paragraphs


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2413 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-22 01:53:57 +00:00
David Lawrence Ramsey
aad85151ae in do_justify(), instead of breaking a line at a space and readding the
space afterwards, just break the line after the space, as it's more
efficient


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2412 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-22 01:25:34 +00:00
David Lawrence Ramsey
7ec8d7c6a3 remove unneeded space
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2411 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-21 08:03:46 +00:00
David Lawrence Ramsey
39e8ce6f8e in printopt(), add DB's tweaks to make sure longflag isn't passed in
when HAVE_GETOPT_LONG isn't defined, and rework the special case of
options that are ignored for Pico compatibility so that they display
more neatly when HAVE_GETOPT_LONG isn't defined; in usage(), fix an
erroneous #ifdef that resulted in the -d/--rebinddelete and -k/--cut
options' not being printed when NANO_SMALL was defined


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2410 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-21 07:24:47 +00:00
David Lawrence Ramsey
afbcf68c1a more cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2409 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-21 06:33:41 +00:00
David Lawrence Ramsey
b9dec213be document cosmetic fix
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2408 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-21 06:14:45 +00:00
David Lawrence Ramsey
928babf8a1 cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2407 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-21 06:12:07 +00:00
David Lawrence Ramsey
2d825bae79 after (re)initializing the terminal, make sure the cursor is always
turned on


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2406 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-20 21:20:47 +00:00
David Lawrence Ramsey
3dfc879f63 Back to CVS
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2405 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-20 20:04:59 +00:00
David Lawrence Ramsey
bec01bd97d GNU nano 1.3.6
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2403 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-20 20:02:51 +00:00
David Lawrence Ramsey
3dd744f392 and make the locale string checks use the #defined strcasestr() alias if
necessary


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2402 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-20 07:26:47 +00:00
David Lawrence Ramsey
adc30a839b put the old #defined aliases for strcasecmp(), strncasecmp(),
strcasestr(), and strnlen() back with the #defined aliases for getline()
and getdelim(), as they make things simpler


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2401 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-20 07:24:49 +00:00
David Lawrence Ramsey
8974efa27b when checking the locale string, use nstrcasestr() if we don't have
strcasestr()


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2400 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-20 06:50:26 +00:00
David Lawrence Ramsey
d96ee5260a add asserts to do_wrap()
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2399 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-20 03:10:31 +00:00
David Lawrence Ramsey
ba1ab86db5 check for a UTF-8-supporting version of slang
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2398 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-20 02:50:31 +00:00
David Lawrence Ramsey
1fc55a268f miscellaneous documentation updates
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2397 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-19 21:33:13 +00:00
David Lawrence Ramsey
543ecf65a6 update changelog again
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2396 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-19 21:20:20 +00:00
David Lawrence Ramsey
735b30c13f minor indentation fix for configure.ac, and mention UTF-8 support in
AUTHORS


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2395 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-19 21:19:26 +00:00
David Lawrence Ramsey
40e211bcec add full multibyte character support to do_wrap()
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2394 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-19 21:15:30 +00:00
David Lawrence Ramsey
9bd56204ee add multibyte character support to help_line_len(), so that UTF-8 help
text is wrapped properly


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2393 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-18 21:29:33 +00:00
David Lawrence Ramsey
d456bfa10d add more locale string checks beyond case-sensitive "UTF-8" so that we
can better detect UTF-8 locales, adapted from Debian's UTF-8 patch for
slang


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2392 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-18 19:07:25 +00:00
David Lawrence Ramsey
22a3564a2e update changelog
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2391 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-18 05:26:54 +00:00
David Lawrence Ramsey
d44a005e3d make the #ifdef around indent_len() match that of its prototype, so that
we can compile with NANO_SMALL and !DISABLE_JUSTIFY again; also add a
comment fix


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2390 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-18 05:20:54 +00:00
David Lawrence Ramsey
df21a2cbdf minor documentation fix
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2389 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-18 04:38:19 +00:00
David Lawrence Ramsey
b349c80f0d allow refreshing of the file browser window, as Pico does
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2388 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-17 19:10:29 +00:00
David Lawrence Ramsey
85616c499b add missing blank line, and rename total_blank() to total_update(), as
the latter is more accurate


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2387 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-17 18:11:08 +00:00
David Lawrence Ramsey
b9ddb80123 allow refreshing of the help browser window, as Pico does, and remove a
few stray spaces from the main help text


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2386 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-17 17:56:48 +00:00
David Lawrence Ramsey
27f2b258d3 initialize indent_string later in the justify code, so as to avoid a
possible memory leak


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2385 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-17 05:08:15 +00:00
David Lawrence Ramsey
102d01da6c fix justify code regression: if we're justifying the entire file, and we
haven't found any paragraph(s), we should refresh the screen and get out
instead of breaking out of the loop and acting as though we've justified
something, so as to avoid a segfault


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2384 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-17 04:48:14 +00:00
David Lawrence Ramsey
fd81a7189b fix paragraph searching code regression: if trying to move to the line
after the end of the next paragraph leaves us on the same line where we
were before, the search should fail in order to avoid an infinite loop


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2383 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-17 04:24:12 +00:00
David Lawrence Ramsey
efec641a82 control characters can only be properly filtered out in both non-UTF-8
and UTF-8 mode inside the output routines, so do it there instead of
inside the input routines


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2382 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-17 03:52:08 +00:00
David Lawrence Ramsey
77abec7ecf fix misplaced #endif
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2381 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-16 17:00:27 +00:00
David Lawrence Ramsey
ba5b12c1fa comment clarifications
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2380 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-16 16:40:21 +00:00
David Lawrence Ramsey
40ea2a2ea0 actually, we can swallow non-ASCII control characters if we're not in
UTF-8 mode


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2379 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-16 16:32:33 +00:00
David Lawrence Ramsey
496488c5d2 when getting printable input from the edit window or statusbar prompt,
don't swallow non-ASCII control characters, since they're parts of UTF-8
sequences


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2378 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-16 15:34:22 +00:00
David Lawrence Ramsey
a17a130d6c add debugging statement
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2377 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-16 14:39:42 +00:00
David Lawrence Ramsey
2161fa6254 check for wget_wch() again instead of get_wch() when looking for the
wide version of curses, since get_wch() might be a macro instead of a
function


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2376 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-16 03:03:41 +00:00
David Lawrence Ramsey
bb0060eb96 documentation update
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2375 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-15 07:20:52 +00:00
David Lawrence Ramsey
631242dd96 a few last minor fixes to do_credits()
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2374 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-15 07:06:54 +00:00
David Lawrence Ramsey
4dc5838ccc in do_credits(), display Florian König's name properly in UTF-8 mode;
since we can't dynamically set that element of the array to its UTF-8
equivalent when in UTF-8 mode, we have to use the ISO-8859-1 version and
pass every string in the credits through make_mbstring() to make sure
they're all UTF-8 (sigh)


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2373 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-15 06:58:02 +00:00
David Lawrence Ramsey
0099a8f45c fix potential memory corruption problem in make_mbstring(), and also fix
compilation with -pedantic


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2372 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-15 06:34:09 +00:00
David Lawrence Ramsey
38156d4491 make the rest of the justify code support multibyte characters
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2371 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-15 05:44:03 +00:00
David Lawrence Ramsey
666644efbc fix more inaccurate comments
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2370 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-14 20:32:00 +00:00
David Lawrence Ramsey
15540051ac when justifying, don't remove a space after a duplicate character in
punct anymore, as it doesn't really make us more compatible with Pico


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2369 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-14 20:06:23 +00:00
David Lawrence Ramsey
7b918c76ee add missing blank lines
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2368 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2005-03-14 19:17:27 +00:00