diff --git a/ChangeLog b/ChangeLog
index 9f4143906..13ab5c901 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-10 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSTextView_actions.m (-moveLeftAndModifySelection:,
+	-moveRightAndModifySelection:, -moveWordLeft:,
+	-moveWordLeftAndModifySelection:, -moveWordRight:,
+	-moveWordRightAndModifySelection:, -setBaseWritingDirection:range:):
+	Add basic implementation for these methods.
+
 2011-06-09 13:49-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/GSTheme.m: Move notifications handling code to
diff --git a/Source/NSTextView_actions.m b/Source/NSTextView_actions.m
index 634307496..bd13ed765 100644
--- a/Source/NSTextView_actions.m
+++ b/Source/NSTextView_actions.m
@@ -986,6 +986,25 @@ check if there was a reason for that.
     }
 }
 
+- (void) moveLeftAndModifySelection: (id)sender
+{
+  NSParagraphStyle *parStyle;
+  NSWritingDirection writingDirection;
+  
+  parStyle = [[self typingAttributes]
+	  	objectForKey: NSParagraphStyleAttributeName];
+  writingDirection = [parStyle baseWritingDirection];
+  
+  if (writingDirection == NSWritingDirectionRightToLeft)
+    {
+        [self moveForwardAndModifySelection: sender];
+    }
+  else
+    {
+        [self moveBackwardAndModifySelection: sender];
+    }
+}
+
 - (void) moveRight: (id)sender
 {
   NSRange range = [self selectedRange];
@@ -1006,6 +1025,24 @@ check if there was a reason for that.
     }
 }
 
+- (void) moveRightAndModifySelection: (id)sender
+{
+  NSParagraphStyle *parStyle;
+  NSWritingDirection writingDirection;
+  
+  parStyle = [[self typingAttributes]
+	  	objectForKey: NSParagraphStyleAttributeName];
+  writingDirection = [parStyle baseWritingDirection];
+  
+  if (writingDirection == NSWritingDirectionRightToLeft)
+    {
+        [self moveBackwardAndModifySelection: sender];
+    }
+  else
+    {
+        [self moveForwardAndModifySelection: sender];
+    }
+}
 
 - (void) moveBackward: (id)sender
 {
@@ -1100,6 +1137,82 @@ check if there was a reason for that.
 	 select: YES];
 }
 
+- (void) moveWordLeft: (id)sender
+{
+  NSParagraphStyle *parStyle;
+  NSWritingDirection writingDirection;
+  
+  parStyle = [[self typingAttributes]
+	  	objectForKey: NSParagraphStyleAttributeName];
+  writingDirection = [parStyle baseWritingDirection];
+  
+  if (writingDirection == NSWritingDirectionRightToLeft)
+    {
+        [self moveWordForward: sender];
+    }
+  else
+    {
+        [self moveWordBackward: sender];
+    }
+}
+
+- (void) moveWordLeftAndModifySelection: (id)sender
+{
+  NSParagraphStyle *parStyle;
+  NSWritingDirection writingDirection;
+  
+  parStyle = [[self typingAttributes]
+	  	objectForKey: NSParagraphStyleAttributeName];
+  writingDirection = [parStyle baseWritingDirection];
+  
+  if (writingDirection == NSWritingDirectionRightToLeft)
+    {
+        [self moveWordForwardAndModifySelection: sender];
+    }
+  else
+    {
+        [self moveWordBackwardAndModifySelection: sender];
+    }
+}
+
+- (void) moveWordRight: (id)sender
+{
+  NSParagraphStyle *parStyle;
+  NSWritingDirection writingDirection;
+  
+  parStyle = [[self typingAttributes]
+	  	objectForKey: NSParagraphStyleAttributeName];
+  writingDirection = [parStyle baseWritingDirection];
+  
+  if (writingDirection == NSWritingDirectionRightToLeft)
+    {
+        [self moveWordBackward: sender];
+    }
+  else
+    {
+        [self moveWordForward: sender];
+    }
+}
+
+- (void) moveWordRightAndModifySelection: (id)sender
+{
+  NSParagraphStyle *parStyle;
+  NSWritingDirection writingDirection;
+  
+  parStyle = [[self typingAttributes]
+	  	objectForKey: NSParagraphStyleAttributeName];
+  writingDirection = [parStyle baseWritingDirection];
+  
+  if (writingDirection == NSWritingDirectionRightToLeft)
+    {
+        [self moveWordBackwardAndModifySelection: sender];
+    }
+  else
+    {
+        [self moveWordForwardAndModifySelection: sender];
+    }
+}
+
 - (void) moveToBeginningOfDocument: (id)sender
 {
   [self _moveTo: 0
@@ -1563,7 +1676,10 @@ and layout is left-to-right */
 - (void) setBaseWritingDirection: (NSWritingDirection)direction
                            range: (NSRange)range
 {
-  // FIXME
+  if (!_tf.is_rich_text)
+    return;
+
+  [_textStorage setBaseWritingDirection: direction range: range];
 }
 
 - (void) toggleBaseWritingDirection: (id)sender