Index: javax/swing/text/DefaultCaret.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/DefaultCaret.java,v
retrieving revision 1.21
diff -u -r1.21 DefaultCaret.java
--- javax/swing/text/DefaultCaret.java	3 Nov 2005 14:39:37 -0000	1.21
+++ javax/swing/text/DefaultCaret.java	3 Nov 2005 23:18:49 -0000
@@ -449,7 +449,7 @@
   protected void positionCaret(MouseEvent event)
   {
     int newDot = getComponent().viewToModel(event.getPoint());
-    moveDot(newDot);
+    setDot(newDot);
   }
 
   /**
Index: javax/swing/text/PlainView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/PlainView.java,v
retrieving revision 1.31
diff -u -r1.31 PlainView.java
--- javax/swing/text/PlainView.java	3 Nov 2005 19:29:00 -0000	1.31
+++ javax/swing/text/PlainView.java	3 Nov 2005 23:18:49 -0000
@@ -326,17 +326,12 @@
     
     Element line = root.getElement(lineClicked);
     Segment s = getLineBuffer();
-
     int start = line.getStartOffset();
-    int end = line.getEndOffset();
+    // We don't want the \n at the end of the line.
+    int end = line.getEndOffset() - 1;
     try
       {
         doc.getText(start, end - start, s);
-        
-        // The end of line symbol (0xA), if being the last member in the
-        // obtained text, should not be counted.
-        if (s.last()==0xA && end>start)
-          s.count--;
       }
     catch (BadLocationException ble)
       {