Index: BaseDocument.java
===================================================================
RCS file: /cvs/editor/libsrc/org/netbeans/editor/BaseDocument.java,v
retrieving revision 1.83.8.2.4.1
diff -c -r1.83.8.2.4.1 BaseDocument.java
*** BaseDocument.java	12 Apr 2002 14:41:23 -0000	1.83.8.2.4.1
--- BaseDocument.java	10 Jan 2003 12:59:35 -0000
***************
*** 214,219 ****
--- 214,225 ----
  
      /** List of bookmarks attached to this document */
      private Bookmarks bookmarks;
+     
+     /* Bug #6258 during composing I18N text using input method the Undoable Edit
+      * actions must be disabled so only the final push (and not all intermediate
+      ones) of the I18N word will be stored as undoable edit.
+      */
+     private boolean composedText = false;
  
      /** Create base document with a specified syntax.
      * @param kitClass class used to initialize this document with proper settings
***************
*** 572,577 ****
--- 578,588 ----
              boolean isComposedText = ((a != null)
                                        && (a.isDefined(StyleConstants.ComposedTextAttribute)));
  
+             if (composedText && !isComposedText)
+                 composedText = false;
+             if (!composedText && isComposedText)
+                 composedText = true;
+             
              if (atomicDepth == 0 && !isComposedText) { // !!! check
                  fireUndoableEditUpdate(new UndoableEditEvent(this, evt));
              }
***************
*** 626,632 ****
                  evt.end();
  
                  fireRemoveUpdate(evt);
!                 if (atomicDepth == 0) {
                      fireUndoableEditUpdate(new UndoableEditEvent(this, evt));
                  }
              } finally {
--- 637,643 ----
                  evt.end();
  
                  fireRemoveUpdate(evt);
!                 if (atomicDepth == 0 && !composedText) {
                      fireUndoableEditUpdate(new UndoableEditEvent(this, evt));
                  }
              } finally {