[ jEdit-CVS ] jEdit/org/gjt/sp/jedit Registers.java,1.29,1.30

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

Update of /cvsroot/jedit/jEdit/org/gjt/sp/jedit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21426

Modified Files:
	Registers.java 
Log Message:
[ 1496191 ] Pasting Text Should End Current Undoable Edit



Index: Registers.java
===================================================================
RCS file: /cvsroot/jedit/jEdit/org/gjt/sp/jedit/Registers.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Registers.java	5 Aug 2005 07:58:41 -0000	1.29
+++ Registers.java	28 May 2006 15:35:26 -0000	1.30
@@ -219,15 +219,14 @@
 				textArea.getToolkit().beep();
 				return;
 			}
-
-			if(vertical && textArea.getSelectionCount() == 0)
+			JEditBuffer buffer = textArea.getBuffer();
+			try
 			{
-				JEditBuffer buffer = textArea.getBuffer();
+				buffer.beginCompoundEdit();
 
-				try
+				/* vertical paste */
+				if(vertical && textArea.getSelectionCount() == 0)
 				{
-					buffer.beginCompoundEdit();
-
 					int caret = textArea.getCaretPosition();
 					int caretLine = textArea.getCaretLine();
 					Selection.Rect rect = new Selection.Rect(
@@ -257,14 +256,14 @@
 						}
 					}
 				}
-				finally
+				else /* Regular paste */ 
 				{
-					buffer.endCompoundEdit();
+					textArea.replaceSelection(selection);
 				}
 			}
-			else
-				textArea.replaceSelection(selection);
-
+			finally {
+				buffer.endCompoundEdit();
+			}
 			HistoryModel.getModel("clipboard").addItem(selection);
 		}
 	} //}}}