Commit Graph

1184 Commits (2dbcc801bf4c51ebad2f8195153716f61f401e81)

Author SHA1 Message Date
David Lawrence Ramsey 698263ca5c in the low-level input routines, make the ascii_digits variables ints
instead of size_t's, since they will only hold very small values


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2136 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-25 05:05:41 +00:00
David Lawrence Ramsey 5b3dd0f423 add DB's overhaul of the multibuffer code for efficiency, plus a few
tweaks and additions of mine


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2134 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-25 04:39:07 +00:00
David Lawrence Ramsey eeec999548 oops again; adding an extra magicline unconditionally when uncutting is
inconsistent with how file insertion behaves, so it apparently is a bug;
revert the previous behavior


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2131 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-24 20:12:57 +00:00
David Lawrence Ramsey cc89513f14 oops; Pico's adding a new magicline unconditionally when uncutting
leaves the cursor on the current magicline is actually consistent (and
hence not a bug), so duplicate that behavior again


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2130 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-23 23:42:12 +00:00
David Lawrence Ramsey d994ad5284 in get_edit_input(), readd parameter allow_funcs, as it's now needed as
a workaround for when unjustified text is stored in the justify buffer
and either the justify or the full justify shortcut is hit


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2128 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-23 21:40:26 +00:00
David Lawrence Ramsey 304129315c in shortcut_init(), fix misplaced #endif keeping the "Full Justify"
shortcut in the search shortcut list from being included when NANO_SMALL
is defined but DISABLE_JUSTIFY isn't


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2127 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-23 20:42:35 +00:00
David Lawrence Ramsey 4d6ec37676 in do_cut_text(), if keep_cutbuffer is FALSE, only blow away the text in
the cutbuffer if the cutbuffer isn't empty


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2126 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-23 17:59:32 +00:00
David Lawrence Ramsey 93c8405bfa overhaul the cutting and uncutting routines and the justify-related
routines to back up and restore unjustified text to use the partitioning
code, as it greatly simplifies how they work; also back up and restore
unjustified text in its own buffer instead of the cutbuffer, and add a
few minor bug fixes to the overhauled routines


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2124 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-23 04:08:28 +00:00
David Lawrence Ramsey b5a7a5a2d6 in do_wrap(), make wrap_loc and word_back ssize_t's, to match fill, and
add a few minor cosmetic fixes


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2123 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-23 03:42:43 +00:00
David Lawrence Ramsey 962202e4fa Back to CVS
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2122 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-22 17:58:06 +00:00
David Lawrence Ramsey 2c86dc6dc9 GNU nano 1.3.5
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2120 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-22 17:55:17 +00:00
David Lawrence Ramsey 3de81bc33d in do_replace_loop(), treat real_current as current and real_current_x
as current_x instead of using copies of them (which aren't kept up to
date) when calling findnextstr(); this fixes a problem where the search
can wrap when it shouldn't and skip over all matches after the wrap
point


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2119 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-22 17:08:41 +00:00
David Lawrence Ramsey e56d936bd4 documentation fix: list sh as an example of a Bourne shell
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2116 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-21 18:51:30 +00:00
David Lawrence Ramsey 831c640e62 in README.CVS, mention the need for ssh to do cvs checkouts
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2115 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-21 18:44:23 +00:00
David Lawrence Ramsey b75763e07e update the given cvs commands in README.CVS so that they work again
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2113 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-21 17:45:25 +00:00
David Lawrence Ramsey 188f169e1d in README.CVS, mention the requirement for groff in order to create html
versions of the manpages


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2112 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-20 16:16:47 +00:00
Jordi Mallach d7b632560c Don't use DEFS to define stuff. Use INCLUDES instead.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2108 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-18 00:05:14 +00:00
Jordi Mallach 55381aa614 Include <config.h> only if HAVE_CONFIG_H.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2107 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-17 23:17:05 +00:00
David Lawrence Ramsey a98fd75b32 spell Ulf Härnhammar's name right
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2102 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-16 13:09:43 +00:00
David Lawrence Ramsey 8091d334a3 add Ulf Harnhammar's input_tab() segfault fix
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2101 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-16 02:23:10 +00:00
David Lawrence Ramsey 97b9046239 document the last fix
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2099 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-15 23:10:56 +00:00
David Lawrence Ramsey 649b431171 in cut_marked_segment(), respect concatenate_cut, as we need to use it
if we do a marked cut and immediately follow it with a cut-to-end (which
uses that function)


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2095 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-13 01:32:17 +00:00
David Lawrence Ramsey bfb98f8bd4 in do_cut_text(), set concatenate_cut to TRUE unconditionally when doing
a marked cut; this fixes an incompatibility with Pico where an extra
line is uncut if we do a marked cut that includes the magicline and
immediately follow it with an unmarked cut


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2094 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-12 21:46:14 +00:00
David Lawrence Ramsey 907725fde8 revert the handle_sigwinch() change, as other breakage occurs when
resizing or continuing from a suspend after a justify and it can't be
properly fixed without a rewrite


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2092 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-12 00:09:20 +00:00
David Lawrence Ramsey 8781fc62cb fix entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2091 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-11 22:02:48 +00:00
David Lawrence Ramsey 1f1ebb85b7 in handle_sigwinch(), call shortcut_init(FALSE) defore redisplaying the
main list, so that "UnJustify" isn't erroneously displayed when we
justify, suspend, and then continue; also add a few last cosmetic fixes


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2090 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-11 21:50:01 +00:00
David Lawrence Ramsey e3016d90aa in m4/Makefile.am, add glib-2.0.m4 to EXTRA_DIST, so that nano builds
from CVS with automake 1.7.x again; for some reason, automake 1.9.x
didn't have a problem with its (erroneously) being left out; also add
some formatting fixes to other Makefile.am's dealing with too many or
too few blank lines


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2089 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-11 14:35:31 +00:00
David Lawrence Ramsey fdd3becc1e allow blank buffers at the "Execute Command" prompt, and document it in
the help text


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2085 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-07 21:30:55 +00:00
David Lawrence Ramsey 02085d7b92 in the search prompt shortcut list, move "Full Justify" to after
"History", so that the latter is visible onscreen again


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2080 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-07 16:04:18 +00:00
David Lawrence Ramsey 50af6ea21e in proto.h, add missing NANO_SMALL #ifdef around the
cut_marked_segment() prototype


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2079 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-07 15:29:40 +00:00
David Lawrence Ramsey 00cca05ebb in do_uncut_text(), maintain current_y's value when uncutting blocks so
that smooth scrolling works correctly; also add a few miscellaneous
cleanups


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2075 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-06 20:33:43 +00:00
David Lawrence Ramsey 90e59c1a18 when doing marked spell-check, properly handle the case where the mark
ends in the middle of a word and that word is spell-checked; also move
the logic to detect an upside-down mark to mark_order() instead of using
the same logic in three different places, and rename a few variables for
consistency


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2070 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-05 23:03:03 +00:00
David Lawrence Ramsey 93eb293fbb more faq updates: add questions about selecting text in an X terminal
when mouse support is turned on and typing F13-F16 when the keyboard
only has F1-F12, plus a few other miscellaneous bits


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2069 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-05 18:01:33 +00:00
David Lawrence Ramsey 0432e70850 fixed FAQ inaccuracy: Pico compatibility mode was made the default in
nano 1.1.99pre1, not 1.2.2


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2067 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-05 17:09:11 +00:00
David Lawrence Ramsey 78d644a635 don't change the file format when we insert another file into the
current one


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2066 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-05 16:24:35 +00:00
David Lawrence Ramsey 3d67c11473 fix entry: "... opened the file, added all of it to the cutbuffer,
closed the file, and uncut at the current cursor position" is clearer


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2063 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-05 15:39:36 +00:00
David Lawrence Ramsey b73c0c0b09 if we're not inserting a file into a new buffer, partition the current
buffer so that it's effectively a new buffer just before inserting the
file, and only restore placewewant afterwards; this is the same behavior
we would get if we opened the file, added all of it to the cutbuffer,
uncut at the current cursor position, and closed the file


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2062 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-05 15:25:53 +00:00
David Lawrence Ramsey 07e2589f80 in cut.c, make marked_line a static enum instead of a static int, and
add a few formatting cleanups


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2056 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-04 13:47:28 +00:00
David Lawrence Ramsey be246c008b fix entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2055 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-04 13:40:58 +00:00
David Lawrence Ramsey 3e0c8a614d remove the DOS_FILE and MAC_FILE flags, as they're only used in files.c,
and replace them with a static file_format enum; change the
openfilestruct structure accordingly in order to handle this; also add a
few miscellaneous cleanups


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2054 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-04 04:08:18 +00:00
David Lawrence Ramsey 84d0d59cbb remove most redundant includes of sys/stat.h; it's included in nano.h,
so it doesn't need to be included in files that include nano.h


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2053 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-04 03:53:11 +00:00
David Lawrence Ramsey e1ee22fba2 in search_init(), when we're replacing and the mark is on, display a
prompt indicating that we're replacing text only in the selection
instead of the usual prompt


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2051 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-03 23:05:11 +00:00
David Lawrence Ramsey 40bdb686aa add code to partition a filestruct between a set of arbitrary
coordinates; given the coordinates of the beginning and end of the mark,
this allows proper and easier handling of saving marked selections,
replacing text only in marked selections, and spell-checking marked
selections using either the internal or alternate spell checker; do all
these using a global partition structure


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2050 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-03 22:03:41 +00:00
David Lawrence Ramsey 4a1fc558cf add new function mallocstrncpy()
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2045 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-02 15:18:30 +00:00
David Lawrence Ramsey 4b4b608806 leave "Mark Text" and "Where Is Next" out entirely when NANO_SMALL is
defined; since they aren't in the visible main list, there's no point in
having them in but disabled; also add a few formatting fixes


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2043 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-01 22:54:40 +00:00
David Lawrence Ramsey 8381fdd83a add new key aliases: F15 for "Mark Text" and F16 for "Where Is Next";
also add support for their corresponding escape sequences


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2042 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-01 22:40:02 +00:00
David Lawrence Ramsey d402e71a2f document the help browser display fix
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2041 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-11-01 22:37:36 +00:00
David Lawrence Ramsey add65085d6 add missing attribution
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2038 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-10-31 14:40:40 +00:00
David Lawrence Ramsey e5e88fd9f2 fix problem found by Rocco: make search_last_line static to search.c
instead of local to findnextstr() so that search wrapping detection
works properly again


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2037 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-10-31 13:20:30 +00:00
David Lawrence Ramsey 85f8f46c40 remove erroneous entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2036 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2004-10-31 13:13:19 +00:00