Merge from trunk.

[bpt/emacs.git] / src / xfaces.c

diff --git a/src/xfaces.c b/src/xfaces.c
index ee41ab6..2dc46b2 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -27,7 +27,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
    1. Font family name.
 
-   2. Font foundary name.
+   2. Font foundry name.
 
    3. Relative proportionate width, aka character set width or set
    width (swidth), e.g. `semi-compressed'.
@@ -4193,12 +4193,12 @@ prepare_face_for_display (struct frame *f, struct face *face)
 static int
 color_distance (XColor *x, XColor *y)
 {
-  /* This formula is from a paper title `Colour metric' by Thiadmer Riemersma.
+  /* This formula is from a paper titled `Colour metric' by Thiadmer Riemersma.
      Quoting from that paper:
 
         This formula has results that are very close to L*u*v* (with the
         modified lightness curve) and, more importantly, it is a more even
-        algorithm: it does not have a range of colours where it suddenly
+        algorithm: it does not have a range of colors where it suddenly
         gives far from optimal results.
 
      See <http://www.compuphase.com/cmetric.htm> for more info.  */