Changeset 214

Timestamp:

11/06/02 18:13:40 (21 years ago)

Author:

piso

Message:

wrapCol, prefixRE

File:

• trunk/j/src/org/armedbear/j/WrapText.java (modified) (5 diffs)

trunk/j/src/org/armedbear/j/WrapText.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: WrapText.java,v 1.4 2002-11-05 19:06:35 piso Exp $
+ * $Id: WrapText.java,v 1.5 2002-11-06 18:13:40 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -44 +44 @@
         dot = editor.getDot();
         mark = editor.getMark();
-        // The column numbers we use internally are 0-based.
-        wrapCol = buffer.getIntegerProperty(Property.WRAP_COL) - 1;
+        wrapCol = buffer.getIntegerProperty(Property.WRAP_COL);
         tabWidth = buffer.getTabWidth();
         isHtml = buffer.getModeId() == HTML_MODE;
@@ -98 +97 @@
         }
     }
-    
+
     private void wrapCommentInternal()
     {
@@ -316 +315 @@
                     ++adjust;
                 remaining = remaining.substring(breakOffset);
-                if (remaining.startsWith(" ")) {
+                if (remaining.length() > 0 && remaining.charAt(0) == ' ') {
                     remaining = remaining.substring(1);
                     if (where <= savedOffset)
@@ -539 +538 @@
         return new Position(endLine, endLine.length());
     }
-    
-    private static final RE prefixRE = new UncheckedRE("^[> ]+");
-    
+
+    private static final RE prefixRE = new UncheckedRE("^>[> ]*");
+
     private static String getPrefix(Line line)
     {