Merge from origin/emacs-24

[gnu-emacs] / lisp / composite.el

diff --git a/lisp/composite.el b/lisp/composite.el
index 666d6c9dd91da6e8dd0f5c94b54e530be89eeebd..4ab31d775a03e9c3a75a133d9533d002c315b366 100644 (file)
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -1,6 +1,6 @@
 ;;; composite.el --- support character composition
 
-;; Copyright (C) 2001-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2015 Free Software Foundation, Inc.
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 ;;   2008, 2009, 2010, 2011
@@ -702,7 +702,7 @@ All non-spacing characters have this function in
            (setq xoff (- (lglyph-rbearing fc))))
        (if (< dc-width fc-width)
            ;; The following glyph is wider, but we don't know how to
-           ;; align both glyphs.  So, try the easiet method;
+           ;; align both glyphs.  So, try the easiest method;
            ;; i.e. align left edges of the glyphs.
            (setq xoff (- xoff (- dc-width) (- (lglyph-lbearing fc )))
                  width (- fc-width dc-width)))