Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-04-07 15:57:54 -0400
committerJean Michel-Lemieux2002-04-07 15:57:54 -0400
commit5604a33c069eab628cf605314103586600e74796 (patch)
tree9e0c075ec3db7487936e23323d9c7d2e8e561953
parent33904d247438d99860d7162dbd76cda70a88b8b4 (diff)
downloadeclipse.platform.team-5604a33c069eab628cf605314103586600e74796.tar.gz
eclipse.platform.team-5604a33c069eab628cf605314103586600e74796.tar.xz
eclipse.platform.team-5604a33c069eab628cf605314103586600e74796.zip
Default keyword mode set to -ko
Keyword mode shown in decorators by default
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorConfiguration.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
index e3b6f948a..efd378257 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
@@ -556,7 +556,7 @@ public abstract class Command extends Request {
* @return an instance for that mode
*/
public static KSubstOption fromFile(IFile file) {
- if (CVSProvider.isText(file)) return KSUBST_TEXT_EXPAND; // XXX should this be KSUBST_TEXT?
+ if (CVSProvider.isText(file)) return KSUBST_TEXT;
return KSUBST_BINARY;
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorConfiguration.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorConfiguration.java
index 80d811ce9..97f7ab19b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorConfiguration.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorConfiguration.java
@@ -32,7 +32,7 @@ public class CVSDecoratorConfiguration {
public static final String DEFAULT_ADDED_FLAG = "*"; //$NON-NLS-1$
// default text decoration formats
- public static final String DEFAULT_FILETEXTFORMAT = "{dirty_flag}{name} {revision} {tag}"; //$NON-NLS-1$
+ public static final String DEFAULT_FILETEXTFORMAT = "{dirty_flag}{name} {revision} {tag} ({keyword})"; //$NON-NLS-1$
public static final String DEFAULT_FOLDERTEXTFORMAT = "{dirty_flag}{name} {tag}"; //$NON-NLS-1$
public static final String DEFAULT_PROJECTTEXTFORMAT = "{dirty_flag}{name} {tag} [{host}]"; //$NON-NLS-1$

Back to the top