Commit Graph

2028 Commits

Author SHA1 Message Date
David Lawrence Ramsey eec40df2a1 in do_insertfile(), remove redundant code: we only mark the file as
modified if we're not in multibuffer mode, in which case view mode
should never be on


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3787 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-13 12:18:57 +00:00
David Lawrence Ramsey c346701d09 in do_insertfile(), if we don't insert a file into a new buffer,
properly update the x-coordinate to account for the number of characters
inserted on the current line


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3786 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-13 04:19:53 +00:00
David Lawrence Ramsey 9a145d906f in do_insertfile(), if we're in view mode, as we can be if multibuffer
mode is on, don't mark the file as modified (and remove the code that
does this in execute_command()); also, if we execute a command in a new
buffer, move back to the beginning of the first line of the buffer
afterwards, for consistency


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3785 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-13 03:06:36 +00:00
David Lawrence Ramsey 1e1117775f in nano.h, remove the manual disabling of color support if regex.h isn't
found, as configure.ac now handles that


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3782 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-12 19:12:40 +00:00
David Lawrence Ramsey 84b9f4bd17 in configure.ac, if regex.h isn't found, display an error message if we
try to enable color support; also, fix the spacing of the error message
displayed when slcurses.h isn't found


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3781 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-12 18:59:29 +00:00
David Lawrence Ramsey 82697f2fcd don't include sys/ioctl.h in nano.c when NANO_TINY is defined, as
ioctl() is never used then


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3780 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-12 18:57:04 +00:00
David Lawrence Ramsey 1a473483b1 in nano.h, if we don't have nanorc support, disable color support, as it
depends on the use of the nanorc


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3779 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-12 18:09:37 +00:00
David Lawrence Ramsey c6c98f7c7a make Jordi's email address, and the description of what the manual pages
were written for, consistent in the documentation


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3778 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-12 16:50:43 +00:00
David Lawrence Ramsey b8592ce2bb in do_browse_from(), don't bother freeing path if it's NULL
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3777 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-11 18:17:56 +00:00
David Lawrence Ramsey b08c9f004c revert erroneous change
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3776 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-11 18:12:24 +00:00
David Lawrence Ramsey 87b37bde9b add miscellaneous minor cleanups to do_browser(), do_browse_from(), and
browser_init()


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3775 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-11 17:25:12 +00:00
David Lawrence Ramsey 4ea2eac360 comment fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3772 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-09 00:52:16 +00:00
David Lawrence Ramsey 4e68588596 revert erroneous change
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3770 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-09 00:47:21 +00:00
David Lawrence Ramsey 7f3fdb4790 in titlebar(), don't display any blank space for the state if we're in
the file browser, as Pico doesn't, and since path is always assumed to
be NULL if DISABLE_BROWSER is defined, put the check for its being NULL
in a DISABLE_BROWSER #define


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3769 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-08 23:45:15 +00:00
David Lawrence Ramsey c2e585ef6c per John M. Gabriele's patch with a few tweaks by me, in
doc/syntax/ruby.nanorc, improve highlighting of constants


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3764 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-07 13:54:38 +00:00
David Lawrence Ramsey 2c36e2eb00 consolidate do_scroll_(up|down)() into do_(up|down)(), as they have a
lot of common code


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3763 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-06 22:17:47 +00:00
David Lawrence Ramsey bf104950fd in do_scroll_up() and do_scroll_down(), fix problems where, after
scrolling, the previous and current lines would not be updated properly
if the current line was not the first or last line of the edit window


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3762 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-06 20:40:53 +00:00
David Lawrence Ramsey aee00d4d14 if the mark isn't on, allow Meta-} and Meta-{ to indent and unindent
only the current line, just as it would if the mark covered only the
current line, instead of displaying a statusbar message and quitting


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3758 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-05 18:42:22 +00:00
David Lawrence Ramsey 85e35e67a2 in get_full_path(), don't return NULL when the current directory doesn't
exist, as we can still recover from that, and also add various cleanups


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3752 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-05 14:14:06 +00:00
David Lawrence Ramsey 51b7b0e7d8 in browser_refresh() and titlebar(), don't display overly long filenames
with ellipses if the number of columns is extremely small; also, in
certain places, call wnoutrefresh(bottomwin) after calling
blank_statusbar(), in order to ensure that the statusbar is actually
blanked


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3751 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-05 06:38:47 +00:00
David Lawrence Ramsey 567d471681 in display_string(), properly handle buf[start_index]'s being a null
terminator


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3749 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-05 05:31:21 +00:00
David Lawrence Ramsey a7bdd2e9c6 in do_browse_from(), during the operating directory check, if path isn't
NULL, don't bother freeing it before mallocstrcpy()ing operating_dir
into it, as the latter operation will free it


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3746 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-05 03:38:49 +00:00
David Lawrence Ramsey 2f7c1a0613 calculate width in browser_init(), as it's more consistent
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3741 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-05 02:05:24 +00:00
David Lawrence Ramsey b520d509cc still more cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3740 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-05 01:13:19 +00:00
David Lawrence Ramsey c0ba4bf3e0 simplify and remove redundancies from various bits
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3739 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-05 01:10:18 +00:00
David Lawrence Ramsey f8d085d2ed in browser_refresh(), fix problem where width wouldn't be properly
initialized sometimes


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3738 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-04 23:47:22 +00:00
David Lawrence Ramsey ed467e50ff in browser_refresh(), add translator comments explaining the maximum
intended lengths of "(dir)" and "(parent dir)"; also add various
formatting fixes


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3727 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-03 18:40:53 +00:00
David Lawrence Ramsey 6b90657d94 more miscellaneous minor fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3720 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-02 18:45:45 +00:00
David Lawrence Ramsey 85ffaeeefc in browser_refresh(), if a filename is too long, truncate and display an
ellipsis before it, as titlebar() does; also add various miscellaneous
minor fixes


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3719 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-02 18:29:49 +00:00
David Lawrence Ramsey c021925abb in browser_init(), fix off-by-one error when calculating longest that
kept the rightmost column of the screen from being used


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3717 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-02 17:00:07 +00:00
David Lawrence Ramsey 21cdee5517 update changelog entries
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3713 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 22:36:29 +00:00
David Lawrence Ramsey 6f499096ad in do_browser() and do_help(), simplify screen update handling
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3708 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 21:01:55 +00:00
David Lawrence Ramsey a4e92c8ad6 in striponedir(), return the stripped path instead of modifying path
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3704 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 14:14:40 +00:00
David Lawrence Ramsey fef232a672 in striponedir(), since all the strings passed to this are dynamically
allocated, use null_at() to strip the directory from the string


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3703 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 13:58:29 +00:00
David Lawrence Ramsey 8cd0d2c751 cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3702 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 07:27:15 +00:00
David Lawrence Ramsey 0fd5d60477 revert last changes, as the "Go to Directory" prompt can allow movement
anywhere, so the error message won't make sense in some cases


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3701 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 07:26:14 +00:00
David Lawrence Ramsey 6cefb9f21a in do_browser(), display an error messsage on the statusbar if we try to
move up from "/" via the "Go to Directory" prompt, for consistency


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3699 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 07:03:42 +00:00
David Lawrence Ramsey d04037760d in do_browser(), after entering "..", select the directory we were in
before instead of the first filename in the list, as Pico does; add new
function browser_select_filename() to help do this properly


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3698 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 06:41:31 +00:00
David Lawrence Ramsey ef45a2528c add missing comments
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3697 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 05:12:53 +00:00
David Lawrence Ramsey 727c244ab6 in findnextfile(), simplify the uses of tail()
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3696 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 04:46:24 +00:00
David Lawrence Ramsey 68e2c375e7 in browser_refresh(), for the ".." entry, display "(parent dir)" instead
of "(dir)", as Pico does


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3695 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 03:19:28 +00:00
David Lawrence Ramsey 99c87ccb0c in browser_refresh(), fix problems where translated versions of "(dir)"
could be truncated, and where file sizes could be too long


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3694 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-30 02:44:11 +00:00
David Lawrence Ramsey b0c1bc28f8 in browser_refresh(), simplify more things
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3692 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-29 15:46:05 +00:00
David Lawrence Ramsey 0e92adf153 in browser_refresh(), simplify the for loop
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3691 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-29 15:28:39 +00:00
David Lawrence Ramsey 3b722460b8 in do_browser(), remove unneeded call to blank_edit()
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3690 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-29 15:08:00 +00:00
David Lawrence Ramsey 865ad94100 in get_mouseinput(), handle both releases and clicks of mouse button 1,
as the mouse support works better that way


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3689 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-29 01:38:58 +00:00
David Lawrence Ramsey 2f94f42730 in do_browser(), refactor and simplify the mouse support, modeling it
after do_mouse() for consistency


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3687 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-28 22:38:11 +00:00
David Lawrence Ramsey 98e4d4f3b1 fix mouse support so that it really ignores everything except releases
of button 1 (i.e, left clicks)


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3686 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-28 21:54:55 +00:00
David Lawrence Ramsey f23cc46655 comment fix
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3685 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-27 00:39:42 +00:00
David Lawrence Ramsey decae6c25e per Mike Frysinger's patch, in doc/syntax/c.nanorc, since .i and .ii are
preprocessed C and C++ output, colorize them there


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3684 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-06-26 23:40:31 +00:00