Merge from emacs-24; up to 2014-07-27T09:41:59Z!ttn@gnu.org

[gnu-emacs] / lisp / composite.el

diff --git a/lisp/composite.el b/lisp/composite.el
index 666d6c9dd91da6e8dd0f5c94b54e530be89eeebd..ca38c39cd6fb4393f30f939610cd4714d2daf9db 100644 (file)
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -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)))