diff --git a/ChangeLog b/ChangeLog
index 6ea653a16..134fb616c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-31 00:37  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/NSTextView.m (-setSelectedRange:affinity:stillSelecting:):
+	Make sure oldRange is always initialized.
+
 2003-12-30  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSBundleAdditions.m (-pathForNibResource:) ignore
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index e0992001e..ad4500549 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -2668,13 +2668,15 @@ afterString in order over charRange.
   if (stillSelectingFlag == YES)
     {
       /* Store the original range before the interactive selection
-         process begin.  That's because we will need to ask the delegate 
+	 process begin.  That's because we will need to ask the delegate
 	 if it's all right for him to do the change, and then notify 
 	 him we did.  In both cases, we need to post the original selection 
 	 together with the new one. */
       if (_layoutManager->_original_selected_range.location == NSNotFound)
 	{
-	  _layoutManager->_original_selected_range = _layoutManager->_selected_range;
+	  oldRange
+	    = _layoutManager->_original_selected_range
+	    = _layoutManager->_selected_range;
 	}
     }
   else