From fe7ade966634848caa5e7206157accd6376a58e0 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 20 Oct 2006 22:10:30 +0000
Subject: [PATCH] Fix bug 160786 -- Ctrl+M sends command

---
 releng/org.eclipse.rse.build/maps/rse.map                       | 2 +-
 releng/org.eclipse.rse.build/template/buildNotes.php            | 1 -
 .../src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map
index 327fbd03db6..a7284c4a987 100644
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ b/releng/org.eclipse.rse.build/maps/rse.map
@@ -30,7 +30,7 @@ plugin@org.eclipse.rse.services.files.ftp=v20061019,:pserver:anonymous:none@dev.
 plugin@org.eclipse.rse.services.local=v20061007,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
 plugin@org.eclipse.rse.services.ssh=v20060921,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
 plugin@org.eclipse.rse.services=v20061019,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
-plugin@org.eclipse.rse.shells.ui=v20061019,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
+plugin@org.eclipse.rse.shells.ui=v20061020,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
 plugin@org.eclipse.rse.subsystems.files.core=v20061019,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
 plugin@org.eclipse.rse.subsystems.files.dstore=v20061006,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
 plugin@org.eclipse.rse.subsystems.files.ftp=v20061008,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index f42a41d3f87..071e19872f7 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -167,7 +167,6 @@ deliverables did not make it into this build:
 The following critical or major bugs are currently known.
 We'll strive to fix these as soon as possible.
 <ul>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=160786">bug 160786</a> - cri - remote shell - ctrl-m maximizes and sends command buffer</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=143462">bug 143462</a> - maj - [updating] Dirty remote editors do not get notified</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=158534">bug 158534</a> - maj - [ssh] Save conflict when modifying remote file</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=158765">bug 158765</a> - maj - content assist miss causes enter to not send command</li>
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java
index 0a3c2579583..8773ccae0a6 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java
@@ -95,7 +95,7 @@ FocusListener
 			if (checkState(e))
 			{
 				
-				if (e.character == '\r') // "enter" key
+				if (e.character == '\r' && e.stateMask!=262144) // "enter" key, but not Ctrl+M (bug 160786)
 				{
 					sendInput();
 				}