Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
plugins {
id "org.jetbrains.intellij" version "0.4.16"
id "org.jetbrains.intellij" version "1.14.1"
}

group 'com.cursive-ide'
version '0.3.900'
version '0.3.901'

intellij {
version '2019.3.3'
pluginName 'emacs-plus'
updateSinceUntilBuild false
version = '2019.3.3'
pluginName = 'emacs-plus'
updateSinceUntilBuild = false
}

publishPlugin {
token publishToken
channels publishChannels.split(',')
token = hasProperty('publishToken') ? publishToken : ''
channels = hasProperty('publishChannels') ? publishChannels.split(',') : []
}

apply plugin: 'java'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
public class KeyboardQuit extends EmacsPlusWrapper {
public KeyboardQuit() {
super(new Handler(getWrappedHandler("EditorEscape")));
setInjectedContext(true);
}

private static class Handler extends EditorActionHandler {
Expand Down
6 changes: 5 additions & 1 deletion src/main/resources/Keymap_EmacsPlus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@
<keyboard-shortcut first-keystroke="ESCAPE" second-keystroke="PERIOD"/>
<mouse-shortcut keystroke="control button1"/>
</action>
<action id="Back">
<keyboard-shortcut first-keystroke="alt COMMA"/>
</action>
<action id="GotoImplementation">
<keyboard-shortcut first-keystroke="control U" second-keystroke="alt PERIOD"/>
</action>
Expand Down Expand Up @@ -302,6 +305,7 @@
</action>
<action id="Emacs+.KillWordBackward">
<keyboard-shortcut first-keystroke="alt DELETE"/>
<keyboard-shortcut first-keystroke="alt BACK_SPACE"/>
<keyboard-shortcut first-keystroke="control BACK_SPACE"/>
<keyboard-shortcut first-keystroke="ESCAPE" second-keystroke="DELETE"/>
<!-- TODO: Temporary binding for backward kill sexp -->
Expand Down Expand Up @@ -497,7 +501,7 @@
<!--<keyboard-shortcut first-keystroke="control shift BACK_SPACE"/>-->
</action>
<action id="EditorKillRegion">
<!--<keyboard-shortcut first-keystroke="control W"/>-->
<keyboard-shortcut first-keystroke="control W"/>
</action>
<action id="$Paste">
<!--<keyboard-shortcut first-keystroke="alt P"/>-->
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</change-notes>

<!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
<idea-version since-build="191.4212.41"/>
<idea-version since-build="193"/>

<!-- please see https://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
on how to target different products -->
Expand Down Expand Up @@ -386,4 +386,4 @@

</actions>

</idea-plugin>
</idea-plugin>