Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

An option to show the colon at the start of the command line box #2064

Merged
merged 15 commits into from
Oct 12, 2017
Merged

An option to show the colon at the start of the command line box #2064

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
45112c8
Dispose modehandler if NO documents match the modehandler document an…
xconverge Oct 7, 2017
19c6e20
Bugfix #1951: text selection in insert mode
DanEEStar Oct 10, 2017
b20cd05
manually ran prettier
DanEEStar Oct 11, 2017
dc7602f
Added an option to show the colon at the start of the command line box
gadkadosh Oct 11, 2017
c11bf8f
Merge pull request #2062 from DanEEStar/bugfix/selecting-insert-mode
xconverge Oct 11, 2017
782d7e5
removed code which is not needed anymore due to #2062
DanEEStar Oct 11, 2017
b42de22
Merge pull request #2065 from DanEEStar/feature/copy-removed-unneeded…
xconverge Oct 11, 2017
9aa47b2
Merge branch 'master' into dispose-old-modehandlers
xconverge Oct 11, 2017
bee6ac6
Merge pull request #2058 from xconverge/dispose-old-modehandlers
xconverge Oct 11, 2017
be55f2c
Added an option to show the colon at the start of the command line box
gadkadosh Oct 11, 2017
297b7ee
Change default of vim.cmdLineInitialColon to false
gadkadosh Oct 11, 2017
59524aa
Added vim.cmdLineInitialColon option to README
gadkadosh Oct 11, 2017
393635d
Fixed a typo in package.json
gadkadosh Oct 11, 2017
c3edde1
Merge with upstream
gadkadosh Oct 11, 2017
8d98c79
Merge conflicts
gadkadosh Oct 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,11 @@
"vim.cmdLineInitialColon": {
"type": "boolean",
"description": "When typing a command show the initial colon ':' character",
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you fix these merge conflicts?

"default": false
=======
"default": "true"
>>>>>>> dc7602fc44b873ee881c60155fd6065cc27c29be
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/configuration/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,11 @@ class ConfigurationClass {
/**
* When typing a command show the initial colon ':' character
*/
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unresolved merge conflicts

cmdLineInitialColon = false;
=======
cmdLineInitialColon = true;
>>>>>>> dc7602fc44b873ee881c60155fd6065cc27c29be
}

function overlapSetting(args: {
Expand Down