diff options
| author | Markus Keller | 2014-07-08 16:23:21 +0000 |
|---|---|---|
| committer | Markus Keller | 2014-07-08 16:27:38 +0000 |
| commit | a19c8c64d3a29cb93630e7fa887ba37518374a5c (patch) | |
| tree | e5795681d46ae324a2cf91f0221f401631d8c0fa /org.eclipse.text | |
| parent | ceb8ba2e4ce15c68277179228945238a5ad20b7b (diff) | |
| download | eclipse.platform.text-a19c8c64d3a29cb93630e7fa887ba37518374a5c.tar.gz eclipse.platform.text-a19c8c64d3a29cb93630e7fa887ba37518374a5c.tar.xz eclipse.platform.text-a19c8c64d3a29cb93630e7fa887ba37518374a5c.zip | |
Bug 439155: [block selection] Pasting multiple lines inserts \r instead of document line delimiterI20140722-0800I20140715-0800
Diffstat (limited to 'org.eclipse.text')
| -rw-r--r-- | org.eclipse.text/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | org.eclipse.text/pom.xml | 4 | ||||
| -rw-r--r-- | org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/org.eclipse.text/META-INF/MANIFEST.MF b/org.eclipse.text/META-INF/MANIFEST.MF index f5dfadd417d..6810efb1d53 100644 --- a/org.eclipse.text/META-INF/MANIFEST.MF +++ b/org.eclipse.text/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.text -Bundle-Version: 3.5.300.qualifier +Bundle-Version: 3.5.400.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: diff --git a/org.eclipse.text/pom.xml b/org.eclipse.text/pom.xml index 71ce608fda6..cb90c94eb58 100644 --- a/org.eclipse.text/pom.xml +++ b/org.eclipse.text/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012, 2013 Eclipse Foundation and others. + Copyright (c) 2012, 2014 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.text</groupId> <artifactId>org.eclipse.text</artifactId> - <version>3.5.300-SNAPSHOT</version> + <version>3.5.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java b/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java index 960c7826368..b30eef61bc1 100644 --- a/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java +++ b/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -471,8 +471,10 @@ public class TextUtilities { } /** - * Returns the default line delimiter for the given document. This is either the delimiter of the first line, or the platform line delimiter if it is - * a legal line delimiter or the first one of the legal line delimiters. The default line delimiter should be used when performing document + * Returns the default line delimiter for the given document. This is + * {@link IDocumentExtension4#getDefaultLineDelimiter()} if available. + * Otherwise, this is either the delimiter of the first line, or the platform line delimiter if it is + * a legal line delimiter, or the first one of the legal line delimiters. The default line delimiter should be used when performing document * manipulations that span multiple lines. * * @param document the document |