1
1

2061 Коммитов

Автор SHA1 Сообщение Дата
David Lawrence Ramsey
3714e07d7b in parse_kbinput(), translate KEY_EVENT to ERR if we get it, so that
it's properly ignored


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3829 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-31 18:25:25 +00:00
David Lawrence Ramsey
7b0531aa0b per Benno Schulenberg's patch with a few tweaks by me, add various
clarifications to translated strings


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3828 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-31 01:30:31 +00:00
David Lawrence Ramsey
57703086e2 make all the descriptions of -O/--morespace consistent
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3826 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-30 23:26:18 +00:00
David Lawrence Ramsey
550ca10378 in nano.texi, add missing description of the -O/--morespace command line
option


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3825 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-30 23:18:15 +00:00
David Lawrence Ramsey
ad344e9d1d make bad_mbchar a static const char* const in chars.c, as its value
doesn't change


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3823 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-29 14:37:47 +00:00
David Lawrence Ramsey
6827146dd2 fix changelog entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3822 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-28 17:07:46 +00:00
David Lawrence Ramsey
b159f941e8 per Benno Schulenberg's patch with a few additions by me, fix
punctuation relating to "i.e." in comments and documentation


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3821 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-28 17:06:27 +00:00
David Lawrence Ramsey
c7c49c48da in doc/Makefile.am, don't include nanorc.sample in EXTRA_DIST, as it's
only useful when we're building from source, as opposed to building a
distribution; also, tweak doc/Makefile.am and doc/man/Makefile.am to
remove usage of the += operator again


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3819 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-26 17:42:16 +00:00
David Lawrence Ramsey
4ce755072c add miscellaneous minor fixes to the faq, and preemptively update its
version number


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3818 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-26 03:20:37 +00:00
David Lawrence Ramsey
2f702285eb in toggle_init(), make sure that a blank line is not displayed after the
Meta-Q toggle when mouse support is disabled and we're in restricted
mode, and that it is displayed all other times


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3817 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-25 22:24:48 +00:00
David Lawrence Ramsey
592ccf9a5e update changelog entry: the renaming of the scroll_dir enums also fixes
compilation on NetBSD 3.0, as reported by Adam Wysocki


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3816 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-25 21:19:02 +00:00
David Lawrence Ramsey
bd28ee472b when DISABLE_HELP is defined, leave out some unused shortcut and toggle
list parameters


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3815 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-25 21:13:30 +00:00
David Lawrence Ramsey
1b4ae6997e in parse_escape_seq_kbinput(), Don't ignore escape sequences anymore;
instead, return the corresponding key so that parse_kbinput() can
translate it


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3814 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-25 19:23:35 +00:00
David Lawrence Ramsey
97cd67c3d4 fix changelog entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3812 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-24 19:15:35 +00:00
David Lawrence Ramsey
f28ff9dece in parse_kbinput(), properly handle combined control character and
escape sequences, so that e.g. Esc Esc / will work properly when the /
is on the numeric keypad and NumLock is off


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3811 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-24 18:53:54 +00:00
David Lawrence Ramsey
ec177be416 in do_help(), don't allow moving down a page when the last line of the
help text is onscreen


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3810 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-23 19:57:30 +00:00
David Lawrence Ramsey
5370b0cd19 in parse_escape_seq_kbinput(), handle unknown and unignored escape
sequences once instead of handling them twice in parse_kbinput()


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3807 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-23 17:54:35 +00:00
David Lawrence Ramsey
19f3bd6546 in parse_kbinput(), translate extended keypad keys to their ASCII
equivalents even when we hit Escape once or twice before typing them,
for consistency; also, if they're defined, translate KEY_SUP into
NANO_PREVLINE_KEY and KEY_SDOWN into NANO_NEXTLINE_KEY, since they are
sometimes generated by Shift-Up and Shift-Down


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3806 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-23 17:25:38 +00:00
David Lawrence Ramsey
a44ca78a50 in parse_kbinput(), properly handle combined meta and escape sequences,
so that e.g. Meta-+ will work properly when the + is on the numeric
keypad and NumLock is off


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3805 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-23 16:00:03 +00:00
David Lawrence Ramsey
118cb37e63 in mbstrncasecmp(), mbstrcasestr(), and mbrevstrcasestr(), don't
allocate space for multibyte characters until we've asserted that the
parameters we're using aren't NULL


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3803 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-22 16:45:11 +00:00
David Lawrence Ramsey
d3887dc695 update UPGRADE to fix the description of +LINE,COLUMN
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3802 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-22 15:57:28 +00:00
David Lawrence Ramsey
c81aa0641c update UPGRADE to account for the ability to indent unmarked lines
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3801 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-21 16:44:44 +00:00
David Lawrence Ramsey
f8758833cd fix changelog entry
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3800 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-19 19:42:47 +00:00
David Lawrence Ramsey
4ac129c4bf when using slang 2.x, call SLutf8_enable() with an argument of 1 instead
of TRUE, as that's the proper way to force its UTF-8 support on


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3799 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-19 19:40:54 +00:00
David Lawrence Ramsey
e53e12559f rename the DISABLE_ROOTWRAP #define to DISABLE_ROOTWRAPPING
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3798 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-19 15:50:19 +00:00
David Lawrence Ramsey
7c06be5ff7 fix changelog entries
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3795 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-19 00:38:27 +00:00
David Lawrence Ramsey
3bb45ae00b per Daniel Richard G.'s patch, in parse_rcfile(), add missing
ENABLE_COLOR #ifdef around the second check for a syntax with no color
commands, to fix compilation without color support


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3794 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-19 00:21:17 +00:00
David Lawrence Ramsey
6ff22e7020 rename the values of the scroll_dir enum to UP_DIR and DOWN_DIR, since
UP is defined as a termcap value in Tru64's curses.h, which breaks
compilation


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3793 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-19 00:14:52 +00:00
David Lawrence Ramsey
0a4b737b73 cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3792 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-18 18:28:10 +00:00
David Lawrence Ramsey
32a3ce4cd2 revert unneeded #ifdef fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3791 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-18 18:25:56 +00:00
David Lawrence Ramsey
935594b14a add various cosmetic and #ifdef fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3790 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-18 18:16:30 +00:00
David Lawrence Ramsey
a5ad825f30 improve the display of bools in debugging statements
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3789 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-13 13:28:13 +00:00
David Lawrence Ramsey
f968a18a3f in replace_regexp(), remove unnecessary casting of c to int
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3788 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2006-07-13 13:27:16 +00:00
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