Merge remote-tracking branch 'origin/master'

diff --git a/plugins/terminal/lib/jediterm-pty-2.2.jar b/plugins/terminal/lib/jediterm-pty-2.2.jar
index e17cba5d15f5bcd938b99a83abfdc63b853bdac1..5bbc389b2302b7dcf569dd694ee83300a456a769 100644 (file)
Binary files a/plugins/terminal/lib/jediterm-pty-2.2.jar and b/plugins/terminal/lib/jediterm-pty-2.2.jar differ

diff --git a/plugins/terminal/resources/jediterm-sh.in b/plugins/terminal/resources/jediterm-sh.in
index 1b3828e6f47d053d96c257dd1a568caeea205e8c..f3c8300738552d6af27a4de6c16ff8f6afe376a8 100644 (file)
--- a/plugins/terminal/resources/jediterm-sh.in
+++ b/plugins/terminal/resources/jediterm-sh.in
@@ -33,9 +33,8 @@ function load_interactive_configs {
 
 if [ `shopt -q login_shell` ]; then
   load_login_configs
-else
-  load_interactive_configs
-fi
+
+load_interactive_configs
 
 # mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving
 bind '"\e\e[C":forward-word'

diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java
index 2f528b5cc832ee8b7a8ac8b2391a4f2ce9dd5566..a8ab18b851ee7e48524c08adc60d76be82e4fe71 100644 (file)
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java
@@ -303,6 +303,7 @@ public class JBTerminalPanel extends TerminalPanel implements FocusListener, Ter
 
   @Override
   public void dispose() {
+    super.dispose();
     mySettingsProvider.removeListener(this);
   }
 }