diff --git a/ChangeLog b/ChangeLog
index 37c7258a1e..225a9ea69b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug 21 01:18:08 1999  Jay Cox  (jaycox@earthlink.net)
+
+	* app/gimprc.[ch]: removed cubic_interpolation variable.
+	* app/transform_core.c: use the interpolation_type variable 
+	instead of the old cubic_interpolation variable.
+
 Sat Aug 21 21:03:00 CST 1999  Seth J. Burgess <sjburges@gimp.org>
 	
 	* plug-ins/common/jpeg.c: committed patch by Steinar Gunderson
@@ -47,7 +53,7 @@ Fri Aug 20 02:17:18 1999  Jay Cox  (jaycox@earthlink.net)
 
 	* app/paint_funcs.c: rewrote scale_region.  It now behaves
 	correctly on images with alpha, no longer leaves an artifact on the
-	right edge of images when scailing up, and runs signifigantly
+	right edge of images when scaling up, and runs significantly
 	faster.
 
 Fri Aug 20 11:21:57 1999  ape@gandalf.spacetec.no  (Asbjorn Pettersen)
diff --git a/app/gimprc.c b/app/gimprc.c
index 3b5483b4bd..68e65acbb4 100644
--- a/app/gimprc.c
+++ b/app/gimprc.c
@@ -130,7 +130,6 @@ int       show_rulers = TRUE;
 int       show_statusbar = TRUE;
 GUnit     default_units = UNIT_INCH;
 int       auto_save = TRUE;
-int       cubic_interpolation = FALSE;
 InterpolationType interpolation_type = LINEAR_INTERPOLATION;
 int       confirm_on_close = TRUE;
 int       save_session_info = TRUE;
diff --git a/app/gimprc.h b/app/gimprc.h
index e41ca0e2ce..efbb49820b 100644
--- a/app/gimprc.h
+++ b/app/gimprc.h
@@ -56,7 +56,6 @@ extern int       show_rulers;
 extern GUnit     default_units;
 extern int       show_statusbar;
 extern int       auto_save;
-extern int       cubic_interpolation;
 extern InterpolationType interpolation_type;
 extern int       confirm_on_close;
 extern int       default_width, default_height;
diff --git a/app/tools/transform_core.c b/app/tools/transform_core.c
index bf76c8dbd5..b5e812e5c5 100644
--- a/app/tools/transform_core.c
+++ b/app/tools/transform_core.c
@@ -15,6 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+
 #include <stdlib.h>
 #include <math.h>
 #include "appenv.h"
@@ -1139,7 +1140,8 @@ transform_core_do (GImage          *gimage,
   alpha = 0;
 
   /*  turn interpolation off for simple transformations (e.g. rot90)  */
-  if (gimp_matrix_is_simple (matrix))
+  if (gimp_matrix_is_simple (matrix)
+      || interpolation_type == NEAREST_NEIGHBOR_INTERPOLATION)
     interpolation = FALSE;
 
   /*  Get the background color  */
@@ -1223,7 +1225,7 @@ transform_core_do (GImage          *gimage,
 
   /* initialise the pixel_surround accessor */
   if (interpolation) {
-    if (cubic_interpolation) {
+    if (interpolation_type == CUBIC_INTERPOLATION) {
       pixel_surround_init(&surround, float_tiles, 4, 4, bg_col);
     } else {
       pixel_surround_init(&surround, float_tiles, 2, 2, bg_col);
@@ -1279,7 +1281,7 @@ transform_core_do (GImage          *gimage,
           if (interpolation)
        	    {
 
-              if (cubic_interpolation)
+              if (interpolation_type == CUBIC_INTERPOLATION)
        	        {
 
                   /*  ttx & tty are the subpixel coordinates of the point in the original
diff --git a/app/transform_core.c b/app/transform_core.c
index bf76c8dbd5..b5e812e5c5 100644
--- a/app/transform_core.c
+++ b/app/transform_core.c
@@ -15,6 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+
 #include <stdlib.h>
 #include <math.h>
 #include "appenv.h"
@@ -1139,7 +1140,8 @@ transform_core_do (GImage          *gimage,
   alpha = 0;
 
   /*  turn interpolation off for simple transformations (e.g. rot90)  */
-  if (gimp_matrix_is_simple (matrix))
+  if (gimp_matrix_is_simple (matrix)
+      || interpolation_type == NEAREST_NEIGHBOR_INTERPOLATION)
     interpolation = FALSE;
 
   /*  Get the background color  */
@@ -1223,7 +1225,7 @@ transform_core_do (GImage          *gimage,
 
   /* initialise the pixel_surround accessor */
   if (interpolation) {
-    if (cubic_interpolation) {
+    if (interpolation_type == CUBIC_INTERPOLATION) {
       pixel_surround_init(&surround, float_tiles, 4, 4, bg_col);
     } else {
       pixel_surround_init(&surround, float_tiles, 2, 2, bg_col);
@@ -1279,7 +1281,7 @@ transform_core_do (GImage          *gimage,
           if (interpolation)
        	    {
 
-              if (cubic_interpolation)
+              if (interpolation_type == CUBIC_INTERPOLATION)
        	        {
 
                   /*  ttx & tty are the subpixel coordinates of the point in the original