diff options
| author | Paul Eggert | 2013-11-04 23:44:14 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-11-04 23:44:14 -0800 |
| commit | a67c4ae05909874c97f86b11dcb8ddc88b3e960c (patch) | |
| tree | 24080844d67cc6e7ba3fa0f043f56612fa679edf | |
| parent | df5b49306e8e82e2f18ed3243700c11ca7835750 (diff) | |
| download | emacs-a67c4ae05909874c97f86b11dcb8ddc88b3e960c.tar.gz emacs-a67c4ae05909874c97f86b11dcb8ddc88b3e960c.zip | |
Spelling fixes.
| -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'. | |||
| 232 | ** prolog-use-smie has been removed, along with the non-SMIE indentation code. | 232 | ** prolog-use-smie has been removed, along with the non-SMIE indentation code. |
| 233 | 233 | ||
| 234 | ** SMIE indentation can be customized via `smie-config'. | 234 | ** SMIE indentation can be customized via `smie-config'. |
| 235 | The customizaton can be guessed by Emacs by providing a sample indented | 235 | The customization can be guessed by Emacs by providing a sample indented |
| 236 | file and letting SMIE learn from it. | 236 | file and letting SMIE learn from it. |
| 237 | 237 | ||
| 238 | ** sh-script now uses its SMIE indentation algorithm by default. | 238 | ** 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 | |||
| 630 | ((and (= class 0) | 630 | ((and (= class 0) |
| 631 | (eq (get-char-code-property (lglyph-char glyph) | 631 | (eq (get-char-code-property (lglyph-char glyph) |
| 632 | 'general-category) 'Me)) | 632 | 'general-category) 'Me)) |
| 633 | ;; Artificially layouting glyphs in an enclosing | 633 | ;; Artificially laying out glyphs in an enclosing |
| 634 | ;; mark is difficult. All we can do is to adjust | 634 | ;; mark is difficult. All we can do is to adjust |
| 635 | ;; the x-offset and width of the base glyph to | 635 | ;; the x-offset and width of the base glyph to |
| 636 | ;; align it at the center of the glyph of the | 636 | ;; align it at the center of the glyph of the |
| 637 | ;; enclosing mark hoping that the enclosing mark | 637 | ;; enclosing mark hoping that the enclosing mark |
| 638 | ;; is big enough. We also have to adjust the | 638 | ;; is big enough. We also have to adjust the |
| 639 | ;; x-offset and width of the mark ifself properly | 639 | ;; x-offset and width of the mark ifself properly |
| 640 | ;; depending on how the glyph is designed | 640 | ;; depending on how the glyph is designed. |
| 641 | 641 | ||
| 642 | ;; (non-spacing or not). For instance, when we | 642 | ;; (non-spacing or not). For instance, when we |
| 643 | ;; have these glyphs: | 643 | ;; 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." | |||
| 436 | 436 | ||
| 437 | (cl-defmacro ert--skip-unless (form) | 437 | (cl-defmacro ert--skip-unless (form) |
| 438 | "Evaluate FORM. If it returns nil, skip the current test. | 438 | "Evaluate FORM. If it returns nil, skip the current test. |
| 439 | Errors during evaluation are catched and handled like nil." | 439 | Errors during evaluation are caught and handled like nil." |
| 440 | (declare (debug t)) | 440 | (declare (debug t)) |
| 441 | (ert--expand-should `(skip-unless ,form) form | 441 | (ert--expand-should `(skip-unless ,form) form |
| 442 | (lambda (inner-form form-description-form _value-var) | 442 | (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)." | |||
| 5460 | (catch 'continue | 5460 | (catch 'continue |
| 5461 | (cond | 5461 | (cond |
| 5462 | ((equal (char-after) ?\{) | 5462 | ((equal (char-after) ?\{) |
| 5463 | ;; block type returned based on outer contraint { or inner | 5463 | ;; block type returned based on outer constraint { or inner |
| 5464 | (if (verilog-at-constraint-p) | 5464 | (if (verilog-at-constraint-p) |
| 5465 | (cond (inconstraint (throw 'nesting 'constraint)) | 5465 | (cond (inconstraint (throw 'nesting 'constraint)) |
| 5466 | (t (throw 'nesting 'statement))))) | 5466 | (t (throw 'nesting 'statement))))) |
| @@ -11101,7 +11101,7 @@ Templates: | |||
| 11101 | it is a good idea to do this for all connections in a template, | 11101 | it is a good idea to do this for all connections in a template, |
| 11102 | as then they will work for any width signal, and with AUTOWIRE. | 11102 | as then they will work for any width signal, and with AUTOWIRE. |
| 11103 | See PTL_BUS becoming PTL_BUSNEW below. | 11103 | See PTL_BUS becoming PTL_BUSNEW below. |
| 11104 | 11104 | ||
| 11105 | Inside a template, a [] in a connection name (with nothing else inside | 11105 | Inside a template, a [] in a connection name (with nothing else inside |
| 11106 | the brackets) will be replaced by the same bus subscript as it is being | 11106 | the brackets) will be replaced by the same bus subscript as it is being |
| 11107 | connected to, or the [] will be removed if it is a single bit signal. | 11107 | 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). */) | |||
| 997 | unibyte. Do not convert DEFAULT_DIRECTORY to | 997 | unibyte. Do not convert DEFAULT_DIRECTORY to |
| 998 | multibyte; instead, convert NAME to a unibyte string, | 998 | multibyte; instead, convert NAME to a unibyte string, |
| 999 | so that the result of this function is also a unibyte | 999 | so that the result of this function is also a unibyte |
| 1000 | string. This is needed during bootstraping and | 1000 | string. This is needed during bootstrapping and |
| 1001 | dumping, when Emacs cannot decode file names, because | 1001 | dumping, when Emacs cannot decode file names, because |
| 1002 | the locale environment is not set up. */ | 1002 | the locale environment is not set up. */ |
| 1003 | name = make_unibyte_string (SSDATA (name), SBYTES (name)); | 1003 | 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, | |||
| 64 | #endif | 64 | #endif |
| 65 | 65 | ||
| 66 | /* The font property key specifying the font design destination. The | 66 | /* The font property key specifying the font design destination. The |
| 67 | value is an unsigned integer code: 0 for WYSIWIG, and 1 for Video | 67 | value is an unsigned integer code: 0 for WYSIWYG, and 1 for Video |
| 68 | text. (See the documentation of X Logical Font Description | 68 | text. (See the documentation of X Logical Font Description |
| 69 | Conventions.) In the Mac font driver, 1 means the screen font is | 69 | Conventions.) In the Mac font driver, 1 means the screen font is |
| 70 | used for calculating some glyph metrics. You can see the | 70 | used for calculating some glyph metrics. You can see the |
| @@ -366,7 +366,7 @@ mac_font_shape_1 (NSFont *font, NSString *string, | |||
| 366 | if (!(textStorage && layoutManager && textContainer)) | 366 | if (!(textStorage && layoutManager && textContainer)) |
| 367 | { | 367 | { |
| 368 | [textStorage release]; | 368 | [textStorage release]; |
| 369 | 369 | ||
| 370 | return 0; | 370 | return 0; |
| 371 | } | 371 | } |
| 372 | 372 | ||
| @@ -1166,7 +1166,7 @@ struct macfont_cache | |||
| 1166 | 1166 | ||
| 1167 | /* The cached glyph for a character c is stored as the (c % | 1167 | /* The cached glyph for a character c is stored as the (c % |
| 1168 | NGLYPHS_IN_VALUE)-th CGGlyph block of a value for the key (c / | 1168 | NGLYPHS_IN_VALUE)-th CGGlyph block of a value for the key (c / |
| 1169 | NGLYPHS_IN_VALUE). However, the glyph for a BMP characrer c is | 1169 | NGLYPHS_IN_VALUE). However, the glyph for a BMP character c is |
| 1170 | not stored here if row_nkeys_or_perm[c / 256] >= | 1170 | not stored here if row_nkeys_or_perm[c / 256] >= |
| 1171 | ROW_PERM_OFFSET. */ | 1171 | ROW_PERM_OFFSET. */ |
| 1172 | CFMutableDictionaryRef dictionary; | 1172 | CFMutableDictionaryRef dictionary; |
| @@ -2472,7 +2472,7 @@ macfont_open (struct frame * f, Lisp_Object entity, int pixel_size) | |||
| 2472 | macfont_info = (struct macfont_info *) font; | 2472 | macfont_info = (struct macfont_info *) font; |
| 2473 | macfont_info->macfont = macfont; | 2473 | macfont_info->macfont = macfont; |
| 2474 | macfont_info->cgfont = mac_font_copy_graphics_font (macfont); | 2474 | macfont_info->cgfont = mac_font_copy_graphics_font (macfont); |
| 2475 | 2475 | ||
| 2476 | val = assq_no_quit (QCdestination, AREF (entity, FONT_EXTRA_INDEX)); | 2476 | val = assq_no_quit (QCdestination, AREF (entity, FONT_EXTRA_INDEX)); |
| 2477 | if (CONSP (val) && EQ (XCDR (val), make_number (1))) | 2477 | if (CONSP (val) && EQ (XCDR (val), make_number (1))) |
| 2478 | macfont_info->screen_font = mac_screen_font_create_with_name (font_name, | 2478 | 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, | |||
| 2679 | } | 2679 | } |
| 2680 | unblock_input (); | 2680 | unblock_input (); |
| 2681 | 2681 | ||
| 2682 | if (metrics) | 2682 | if (metrics) |
| 2683 | metrics->width = width; | 2683 | metrics->width = width; |
| 2684 | 2684 | ||
| 2685 | return width; | 2685 | return width; |
| @@ -2741,7 +2741,7 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y, | |||
| 2741 | for (i = 0; i < len; i++) | 2741 | for (i = 0; i < len; i++) |
| 2742 | { | 2742 | { |
| 2743 | int width; | 2743 | int width; |
| 2744 | 2744 | ||
| 2745 | glyphs[i] = *(s->char2b + s->cmp_from + i); | 2745 | glyphs[i] = *(s->char2b + s->cmp_from + i); |
| 2746 | width = (s->padding_p ? 1 | 2746 | width = (s->padding_p ? 1 |
| 2747 | : macfont_glyph_extents (s->font, glyphs[i], | 2747 | : macfont_glyph_extents (s->font, glyphs[i], |
| @@ -3001,7 +3001,7 @@ struct non_default_uvs_table | |||
| 3001 | #define BUINT32_VALUE(lval) OSReadBigInt32 (&(lval), 0) | 3001 | #define BUINT32_VALUE(lval) OSReadBigInt32 (&(lval), 0) |
| 3002 | 3002 | ||
| 3003 | /* Return UVS subtable for the specified FONT. If the subtable is not | 3003 | /* Return UVS subtable for the specified FONT. If the subtable is not |
| 3004 | found or ill-formated, then return NULL. */ | 3004 | found or ill-formatted, then return NULL. */ |
| 3005 | 3005 | ||
| 3006 | static CFDataRef | 3006 | static CFDataRef |
| 3007 | mac_font_copy_uvs_table (FontRef font) | 3007 | 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, | |||
| 518 | help_echo_window, help_echo_object, | 518 | help_echo_window, help_echo_object, |
| 519 | help_echo_pos); | 519 | help_echo_pos); |
| 520 | } | 520 | } |
| 521 | /* We alread called kbd_buffer_store_event, so indicate the | 521 | /* We already called kbd_buffer_store_event, so indicate the |
| 522 | the caller it shouldn't. */ | 522 | the caller it shouldn't. */ |
| 523 | return 0; | 523 | return 0; |
| 524 | } | 524 | } |