in do_toggle(), properly treat color syntax highlighting as enabled by
default, and only treat wrapping as enabled by default when DISABLE_WRAPPING isn't defined git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2767 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
7f77e1dcdd
commit
d4471ebe0e
|
@ -238,6 +238,10 @@ CVS code -
|
||||||
(DLR)
|
(DLR)
|
||||||
- Don't set current_len until after it's been asserted that both
|
- Don't set current_len until after it's been asserted that both
|
||||||
current and current->data aren't NULL. (DLR)
|
current and current->data aren't NULL. (DLR)
|
||||||
|
do_toggle()
|
||||||
|
- Properly treat color syntax highlighting as enabled by
|
||||||
|
default, and only treat wrapping as enabled by default when
|
||||||
|
DISABLE_WRAPPING isn't defined. (DLR)
|
||||||
disable_extended_input()
|
disable_extended_input()
|
||||||
- Disable extended output processing as well as extended input
|
- Disable extended output processing as well as extended input
|
||||||
processing, and rename to disable_extended_io(). (DLR)
|
processing, and rename to disable_extended_io(). (DLR)
|
||||||
|
|
10
src/nano.c
10
src/nano.c
|
@ -3723,8 +3723,14 @@ void do_toggle(const toggle *which)
|
||||||
|
|
||||||
enabled = ISSET(which->flag);
|
enabled = ISSET(which->flag);
|
||||||
|
|
||||||
if (which->val == TOGGLE_NOHELP_KEY ||
|
if (which->val == TOGGLE_NOHELP_KEY
|
||||||
which->val == TOGGLE_WRAP_KEY)
|
#ifndef DISABLE_WRAPPING
|
||||||
|
|| which->val == TOGGLE_WRAP_KEY
|
||||||
|
#endif
|
||||||
|
#ifdef ENABLE_COLOR
|
||||||
|
|| which->val == TOGGLE_SYNTAX_KEY
|
||||||
|
#endif
|
||||||
|
)
|
||||||
enabled = !enabled;
|
enabled = !enabled;
|
||||||
|
|
||||||
statusbar("%s %s", which->desc, enabled ? _("enabled") :
|
statusbar("%s %s", which->desc, enabled ? _("enabled") :
|
||||||
|
|
Loading…
Reference in New Issue