Skip to content

Commit

Permalink
Renamed line wrapping keys for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
TheQwertiest committed Oct 5, 2018
1 parent 0c44691 commit 348ea8b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion component/colour schemes/readme.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Use File>Preferences>Tools>JScript Panel to import these.
Use `Preferences > Tools > Spider Monkey Panel` to import these.
10 changes: 5 additions & 5 deletions foo_spider_monkey_panel/editorctrl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1068,25 +1068,25 @@ void CScriptEditorCtrl::SetScintillaSettings()
}
};

auto retVal = getIntFromProp( "sci.wrap.mode" );
auto retVal = getIntFromProp( "style.wrap.mode" );
if ( retVal )
{
SetWrapMode( retVal.value() );
}

retVal = getIntFromProp( "sci.wrap.visualflags" );
retVal = getIntFromProp( "style.wrap.visualflags" );
if ( retVal )
{
SetWrapVisualFlags( retVal.value() );
}

retVal = getIntFromProp( "sci.wrap.visualflags.location" );
retVal = getIntFromProp( "style.wrap.visualflags.location" );
if ( retVal )
{
SetWrapVisualFlagsLocation( retVal.value() );
}

retVal = getIntFromProp( "sci.wrap.indentmode" );
retVal = getIntFromProp( "style.wrap.indentmode" );
if ( retVal )
{
SetWrapIndentMode( retVal.value() );
Expand All @@ -1101,7 +1101,7 @@ void CScriptEditorCtrl::SetJScript()
" interface long native new null package private protected public return"
" short static super switch synchronized this throw throws transient true"
" try typeof var void while with enum byvalue cast future generic inner"
" operator outer rest Array Math RegExp window fb gdi utils wsh_utils plman console";
" operator outer rest Array Math RegExp window fb gdi utils plman console";

RestoreDefaultStyle();

Expand Down
8 changes: 4 additions & 4 deletions foo_spider_monkey_panel/scintilla_prop_sets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ const t_prop_set_init_table prop_sets_init_table[] =
{ "style.caret.width", "1" },
{ "style.caret.line.back", "" },
{ "style.caret.line.back.alpha", "256" },
{ "sci.wrap.mode", "0" }, // SC_WRAP_NONE
{ "sci.wrap.visualflags", "1" }, // SC_WRAPVISUALFLAG_END
{ "sci.wrap.visualflags.location", "0" }, // SC_WRAPVISUALFLAGLOC_DEFAULT
{ "sci.wrap.indentmode", "0" }, // SC_WRAPINDENT_FIXED
{ "style.wrap.mode", "0" }, // SC_WRAP_NONE
{ "style.wrap.visualflags", "1" }, // SC_WRAPVISUALFLAG_END
{ "style.wrap.visualflags.location", "0" }, // SC_WRAPVISUALFLAGLOC_DEFAULT
{ "style.wrap.indentmode", "0" }, // SC_WRAPINDENT_FIXED
{ "api.jscript", "$(dir.component)jscript.api;$(dir.component)interface.api" },
{ 0, 0 },
};
Expand Down

0 comments on commit 348ea8b

Please sign in to comment.