master f695fdf: ; Fix US spelling in last change.

[Basil L. Contovounesios]

branch: master
commit f695fdfef7d8e9ea4e0e17b69e0a28f952db55d6
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    ; Fix US spelling in last change.
---
 doc/lispref/display.texi | 2 +-
 src/image.c              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 3d91ed2..6dfbabb 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5396,7 +5396,7 @@ is performed after scaling and cropping.
 When @code{t} any image transform will have smoothing applied, and if
 @code{nil} no smoothing will be applied.  The exact algorithm used
 will be platform dependent, but should be equivalent to bilinear
-filtering.  Disabling smoothing will use a nearest neighbour
+filtering.  Disabling smoothing will use a nearest neighbor
 algorithm.
 
 The default, if this property is not specified, will be for
diff --git a/src/image.c b/src/image.c
index 95ae573..485e08a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2225,7 +2225,7 @@ image_set_transform (struct frame *f, struct image *img)
   compute_image_rotation (img, &rotation);
 
 # if defined USE_CAIRO || defined HAVE_XRENDER || defined HAVE_NS
-  /* We want scale up operations to use a nearest neighbour filter to
+  /* We want scale up operations to use a nearest neighbor filter to
      show real pixels instead of munging them, but scale down
      operations to use a blended filter, to avoid aliasing and the like.