diff options
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/composite.el | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/ert.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/verilog-mode.el | 4 | ||||
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/macfont.m | 14 | ||||
| -rw-r--r-- | src/w32inevt.c | 2 |
7 files changed, 15 insertions, 15 deletions
@@ -232,7 +232,7 @@ You can pick the name of the function and the variables with `C-x 4 a'. ** prolog-use-smie has been removed, along with the non-SMIE indentation code. ** SMIE indentation can be customized via `smie-config'. -The customizaton can be guessed by Emacs by providing a sample indented +The customization can be guessed by Emacs by providing a sample indented file and letting SMIE learn from it. ** sh-script now uses its SMIE indentation algorithm by default. diff --git a/lisp/composite.el b/lisp/composite.el index e0585f80880..f2f4437cadb 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -630,14 +630,14 @@ All non-spacing characters have this function in ((and (= class 0) (eq (get-char-code-property (lglyph-char glyph) 'general-category) 'Me)) - ;; Artificially layouting glyphs in an enclosing + ;; Artificially laying out glyphs in an enclosing ;; mark is difficult. All we can do is to adjust ;; the x-offset and width of the base glyph to ;; align it at the center of the glyph of the ;; enclosing mark hoping that the enclosing mark ;; is big enough. We also have to adjust the ;; x-offset and width of the mark ifself properly - ;; depending on how the glyph is designed + ;; depending on how the glyph is designed. ;; (non-spacing or not). For instance, when we ;; have these glyphs: diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index ed7633e2795..a131f48c488 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -436,7 +436,7 @@ failed." (cl-defmacro ert--skip-unless (form) "Evaluate FORM. If it returns nil, skip the current test. -Errors during evaluation are catched and handled like nil." +Errors during evaluation are caught and handled like nil." (declare (debug t)) (ert--expand-should `(skip-unless ,form) form (lambda (inner-form form-description-form _value-var) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 7044943d5cb..e67639b671b 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -5460,7 +5460,7 @@ Return a list of two elements: (INDENT-TYPE INDENT-LEVEL)." (catch 'continue (cond ((equal (char-after) ?\{) - ;; block type returned based on outer contraint { or inner + ;; block type returned based on outer constraint { or inner (if (verilog-at-constraint-p) (cond (inconstraint (throw 'nesting 'constraint)) (t (throw 'nesting 'statement))))) @@ -11101,7 +11101,7 @@ Templates: it is a good idea to do this for all connections in a template, as then they will work for any width signal, and with AUTOWIRE. See PTL_BUS becoming PTL_BUSNEW below. - + Inside a template, a [] in a connection name (with nothing else inside the brackets) will be replaced by the same bus subscript as it is being connected to, or the [] will be removed if it is a single bit signal. diff --git a/src/fileio.c b/src/fileio.c index 884af25f9fc..d54c43c4635 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -997,7 +997,7 @@ filesystem tree, not (expand-file-name ".." dirname). */) unibyte. Do not convert DEFAULT_DIRECTORY to multibyte; instead, convert NAME to a unibyte string, so that the result of this function is also a unibyte - string. This is needed during bootstraping and + string. This is needed during bootstrapping and dumping, when Emacs cannot decode file names, because the locale environment is not set up. */ name = make_unibyte_string (SSDATA (name), SBYTES (name)); diff --git a/src/macfont.m b/src/macfont.m index 4b8be551786..c284b3086f8 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -64,7 +64,7 @@ static CGGlyph mac_ctfont_get_glyph_for_cid (CTFontRef, #endif /* The font property key specifying the font design destination. The - value is an unsigned integer code: 0 for WYSIWIG, and 1 for Video + value is an unsigned integer code: 0 for WYSIWYG, and 1 for Video text. (See the documentation of X Logical Font Description Conventions.) In the Mac font driver, 1 means the screen font is used for calculating some glyph metrics. You can see the @@ -366,7 +366,7 @@ mac_font_shape_1 (NSFont *font, NSString *string, if (!(textStorage && layoutManager && textContainer)) { [textStorage release]; - + return 0; } @@ -1166,7 +1166,7 @@ struct macfont_cache /* The cached glyph for a character c is stored as the (c % NGLYPHS_IN_VALUE)-th CGGlyph block of a value for the key (c / - NGLYPHS_IN_VALUE). However, the glyph for a BMP characrer c is + NGLYPHS_IN_VALUE). However, the glyph for a BMP character c is not stored here if row_nkeys_or_perm[c / 256] >= ROW_PERM_OFFSET. */ CFMutableDictionaryRef dictionary; @@ -2472,7 +2472,7 @@ macfont_open (struct frame * f, Lisp_Object entity, int pixel_size) macfont_info = (struct macfont_info *) font; macfont_info->macfont = macfont; macfont_info->cgfont = mac_font_copy_graphics_font (macfont); - + val = assq_no_quit (QCdestination, AREF (entity, FONT_EXTRA_INDEX)); if (CONSP (val) && EQ (XCDR (val), make_number (1))) macfont_info->screen_font = mac_screen_font_create_with_name (font_name, @@ -2679,7 +2679,7 @@ macfont_text_extents (struct font *font, unsigned int *code, int nglyphs, } unblock_input (); - if (metrics) + if (metrics) metrics->width = width; return width; @@ -2741,7 +2741,7 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y, for (i = 0; i < len; i++) { int width; - + glyphs[i] = *(s->char2b + s->cmp_from + i); width = (s->padding_p ? 1 : macfont_glyph_extents (s->font, glyphs[i], @@ -3001,7 +3001,7 @@ struct non_default_uvs_table #define BUINT32_VALUE(lval) OSReadBigInt32 (&(lval), 0) /* Return UVS subtable for the specified FONT. If the subtable is not - found or ill-formated, then return NULL. */ + found or ill-formatted, then return NULL. */ static CFDataRef mac_font_copy_uvs_table (FontRef font) diff --git a/src/w32inevt.c b/src/w32inevt.c index c5d3fa3ad7d..dc587de1183 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -518,7 +518,7 @@ do_mouse_event (MOUSE_EVENT_RECORD *event, help_echo_window, help_echo_object, help_echo_pos); } - /* We alread called kbd_buffer_store_event, so indicate the + /* We already called kbd_buffer_store_event, so indicate the the caller it shouldn't. */ return 0; } |