[ jEdit-commits ] SF.net SVN: jedit:[20408] jEdit/branches/4.5.x

[<ez...@us...>]

Revision: 20408
          http://jedit.svn.sourceforge.net/jedit/?rev=20408&view=rev
Author:   ezust
Date:     2011-11-22 19:45:48 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Merge request# 3433905 for bug# 3163058. middle mouse button paste. 

Modified Paths:
--------------
    jEdit/branches/4.5.x/doc/CHANGES.txt
    jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/Gutter.java

Property Changed:
----------------
    jEdit/branches/4.5.x/


Property changes on: jEdit/branches/4.5.x
___________________________________________________________________
Modified: svn:mergeinfo
   - /jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:20117,20132,20250,20254,20262,20264,20277,20296,20347,20349
   + /jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349

Modified: jEdit/branches/4.5.x/doc/CHANGES.txt
===================================================================
--- jEdit/branches/4.5.x/doc/CHANGES.txt	2011-11-21 23:16:57 UTC (rev 20407)
+++ jEdit/branches/4.5.x/doc/CHANGES.txt	2011-11-22 19:45:48 UTC (rev 20408)
@@ -4,10 +4,13 @@
 
 {{{ Version 4.5pre2
 
-Thanks to Björn "Vampire" Kautler for contributing to this release.
+Thanks to Shlomy Reinstein, Alan Ezust, and Björn "Vampire" Kautler for 
+contributing to this release.
 
 {{{ Bug Fixes
 
+- Fixed #3163058: middle mouse button paste doesn't respect gutter selection.
+  (Shlomy Reinstein)
 
 }}}
 {{{ Miscellaneous
@@ -509,4 +512,4 @@
 }}}
 
 jEdit buffer local properties:
-:folding=explicit:collapseFolds=2:
+:folding=explicit:collapseFolds=2:maxLineLen=80:wrap=hard:tabsize=4:

Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/Gutter.java
===================================================================
--- jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/Gutter.java	2011-11-21 23:16:57 UTC (rev 20407)
+++ jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/Gutter.java	2011-11-22 19:45:48 UTC (rev 20408)
@@ -30,6 +30,7 @@
 import javax.swing.border.*;
 import javax.swing.event.*;
 
+import org.gjt.sp.jedit.Registers;
 import org.gjt.sp.jedit.buffer.BufferAdapter;
 import org.gjt.sp.jedit.buffer.BufferListener;
 import org.gjt.sp.jedit.buffer.JEditBuffer;
@@ -882,6 +883,7 @@
 		MouseActionsProvider mouseActions;
 		boolean drag;
 		int toolTipInitialDelay, toolTipReshowDelay;
+		int selectionStart;
 		boolean selectLines;
 		int selAnchorLine;
 		GutterPopupHandler selectionPopupHandler;
@@ -945,9 +947,9 @@
 
 				if (e.getX() >= FOLD_MARKER_SIZE)
 				{
+					selectionStart = textArea.getLineStartOffset(line);
 					Selection s = new Selection.Range(
-						textArea.getLineStartOffset(line),
-						getFoldEndOffset(line));
+						selectionStart, getFoldEndOffset(line));
 					if(textArea.isMultipleSelectionEnabled())
 						textArea.addToSelection(s);
 					else
@@ -1123,6 +1125,12 @@
 				e.translatePoint(-getWidth(),0);
 				textArea.mouseHandler.mouseReleased(e);
 			}
+			if (selectLines)
+			{
+				Selection sel = textArea.getSelectionAtOffset(selectionStart);
+				if(sel != null)
+					Registers.setRegister('%', textArea.getSelectedText(sel));
+			}
 
 			drag = false;
 			selectLines = false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.