From 08bad175d45dad7bb872c604cd2b8e84cc1cc5bb Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 14 Jun 2015 22:55:16 -0700 Subject: [PATCH] Spelling fixes --- lisp/international/fontset.el | 2 +- src/ftcrfont.c | 4 ++-- src/xdisp.c | 4 ++-- test/automated/help-fns.el | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index acc3732fb2a..279382b6f5a 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -743,7 +743,7 @@ (#xFE10 . #xFE1F) ;; Vertical Forms (#x10100 . #x1013F) ;; Aegean Numbers (#x102E0 . #x102FF) ;; Coptic Epact Numbers - (#x1D000 . #x1D0FF) ;; Byzanthine Musical Symbols + (#x1D000 . #x1D0FF) ;; Byzantine Musical Symbols (#x1D200 . #x1D24F) ;; Ancient Greek Musical Notation (#x1F0A0 . #x1F0FF) ;; Playing Cards (#x1F100 . #x1F1FF) ;; Enclosed Alphanumeric Suppl diff --git a/src/ftcrfont.c b/src/ftcrfont.c index 0cbfd804109..df3aa596f6b 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c @@ -34,8 +34,8 @@ along with GNU Emacs. If not, see . */ /* FTCR font driver. */ -/* The actual structure for ftcr font that can be casted to struct - font. */ +/* The actual structure for FTCR font. A pointer to this structure + can be cast to struct font *. */ struct ftcrfont_info { diff --git a/src/xdisp.c b/src/xdisp.c index f0e30900043..7c153302803 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -24618,7 +24618,7 @@ normal_char_ascent_descent (struct font *font, int c, int *ascent, int *descent) /* A subroutine that computes a reasonable "normal character height" for fonts that claim preposterously large vertical dimensions, but - whose glyphs are actually reasonably sized. C is the charcater + whose glyphs are actually reasonably sized. C is the character whose metrics to use for those fonts, or -1 for default character. */ static int @@ -26761,7 +26761,7 @@ x_produce_glyphs (struct it *it) don't let the row ascent and descent values (and the row height computed from them) be smaller than the "normal" character metrics. This avoids unpleasant effects - whereby lines on display would change their heigh + whereby lines on display would change their height depending on which characters are shown. */ normal_char_ascent_descent (font, -1, &font_ascent, &font_descent); it->max_ascent = max (it->max_ascent, font_ascent); diff --git a/test/automated/help-fns.el b/test/automated/help-fns.el index 4815ac68257..b8772eb84d6 100644 --- a/test/automated/help-fns.el +++ b/test/automated/help-fns.el @@ -37,7 +37,7 @@ (defun abc\\\[universal-argument\]b\`c\'d\\e\"f (x) "A function with a funny name. -\(fn XYYZZY)" +\(fn XYZZY)" x) (defun defgh\\\[universal-argument\]b\`c\'d\\e\"f (x) @@ -50,7 +50,7 @@ (with-current-buffer "*Help*" (goto-char (point-min)) (should (search-forward - "(abc\\\\\\[universal-argument\\]b\\`c\\'d\\\\e\\\"f XYYZZY)"))) + "(abc\\\\\\[universal-argument\\]b\\`c\\'d\\\\e\\\"f XYZZY)"))) (describe-function 'defgh\\\[universal-argument\]b\`c\'d\\e\"f) (with-current-buffer "*Help*" (goto-char (point-min)) -- 2.11.4.GIT