diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/alloc.c | 2 | ||||
| -rw-r--r-- | src/bytecode.c | 2 | ||||
| -rw-r--r-- | src/coding.h | 2 | ||||
| -rw-r--r-- | src/emacs.c | 2 | ||||
| -rw-r--r-- | src/font.c | 2 | ||||
| -rw-r--r-- | src/image.c | 2 | ||||
| -rw-r--r-- | src/indent.c | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 2 | ||||
| -rw-r--r-- | src/nsterm.m | 2 | ||||
| -rw-r--r-- | src/sound.c | 2 | ||||
| -rw-r--r-- | src/w32fns.c | 2 | ||||
| -rw-r--r-- | src/w32font.c | 2 | ||||
| -rw-r--r-- | src/w32menu.c | 2 | ||||
| -rw-r--r-- | src/w32term.c | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/src/alloc.c b/src/alloc.c index 985e4b71426..1d274e2111e 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -882,7 +882,7 @@ safe_alloca_unwind (Lisp_Object arg) | |||
| 882 | 882 | ||
| 883 | /* Like malloc but used for allocating Lisp data. NBYTES is the | 883 | /* Like malloc but used for allocating Lisp data. NBYTES is the |
| 884 | number of bytes to allocate, TYPE describes the intended use of the | 884 | number of bytes to allocate, TYPE describes the intended use of the |
| 885 | allcated memory block (for strings, for conses, ...). */ | 885 | allocated memory block (for strings, for conses, ...). */ |
| 886 | 886 | ||
| 887 | #ifndef USE_LSB_TAG | 887 | #ifndef USE_LSB_TAG |
| 888 | static void *lisp_malloc_loser; | 888 | static void *lisp_malloc_loser; |
diff --git a/src/bytecode.c b/src/bytecode.c index 91d360bec1b..3af0abd63cf 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -271,7 +271,7 @@ struct byte_stack | |||
| 271 | /* A list of currently active byte-code execution value stacks. | 271 | /* A list of currently active byte-code execution value stacks. |
| 272 | Fbyte_code adds an entry to the head of this list before it starts | 272 | Fbyte_code adds an entry to the head of this list before it starts |
| 273 | processing byte-code, and it removed the entry again when it is | 273 | processing byte-code, and it removed the entry again when it is |
| 274 | done. Signaling an error truncates the list analoguous to | 274 | done. Signaling an error truncates the list analogous to |
| 275 | gcprolist. */ | 275 | gcprolist. */ |
| 276 | 276 | ||
| 277 | struct byte_stack *byte_stack_list; | 277 | struct byte_stack *byte_stack_list; |
diff --git a/src/coding.h b/src/coding.h index fdf9b762e75..2621928adc3 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -518,7 +518,7 @@ struct coding_system | |||
| 518 | #define CODING_REQUIRE_DETECTION_MASK 0x1000 | 518 | #define CODING_REQUIRE_DETECTION_MASK 0x1000 |
| 519 | #define CODING_RESET_AT_BOL_MASK 0x2000 | 519 | #define CODING_RESET_AT_BOL_MASK 0x2000 |
| 520 | 520 | ||
| 521 | /* Return 1 if the coding context CODING requires annotaion | 521 | /* Return 1 if the coding context CODING requires annotation |
| 522 | handling. */ | 522 | handling. */ |
| 523 | #define CODING_REQUIRE_ANNOTATION(coding) \ | 523 | #define CODING_REQUIRE_ANNOTATION(coding) \ |
| 524 | ((coding)->common_flags & CODING_ANNOTATION_MASK) | 524 | ((coding)->common_flags & CODING_ANNOTATION_MASK) |
diff --git a/src/emacs.c b/src/emacs.c index 12be7bc0808..529fa35a5bd 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -1402,7 +1402,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem | |||
| 1402 | #endif | 1402 | #endif |
| 1403 | 1403 | ||
| 1404 | /* argmatch must not be used after here, | 1404 | /* argmatch must not be used after here, |
| 1405 | except when bulding temacs | 1405 | except when building temacs |
| 1406 | because the -d argument has not been skipped in skip_args. */ | 1406 | because the -d argument has not been skipped in skip_args. */ |
| 1407 | 1407 | ||
| 1408 | #ifdef MSDOS | 1408 | #ifdef MSDOS |
diff --git a/src/font.c b/src/font.c index ead8225471e..3fc5fc944b4 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -5144,7 +5144,7 @@ the corresponding glyph code. If ENCODING is a char-table, looking up | |||
| 5144 | the table by a character gives the corresponding glyph code. | 5144 | the table by a character gives the corresponding glyph code. |
| 5145 | 5145 | ||
| 5146 | REPERTORY specifies a repertory of characters supported by the font. | 5146 | REPERTORY specifies a repertory of characters supported by the font. |
| 5147 | If REPERTORY is a charset, all characters beloging to the charset are | 5147 | If REPERTORY is a charset, all characters belonging to the charset are |
| 5148 | supported. If REPERTORY is a char-table, all characters who have a | 5148 | supported. If REPERTORY is a char-table, all characters who have a |
| 5149 | non-nil value in the table are supported. If REPERTORY is nil, Emacs | 5149 | non-nil value in the table are supported. If REPERTORY is nil, Emacs |
| 5150 | gets the repertory information by an opened font and ENCODING. */); | 5150 | gets the repertory information by an opened font and ENCODING. */); |
diff --git a/src/image.c b/src/image.c index 1869b83ac2a..8b64bdf20b0 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -8781,7 +8781,7 @@ syms_of_image (void) | |||
| 8781 | operation on GNU/Linux of calling dump-emacs after loading some images. */ | 8781 | operation on GNU/Linux of calling dump-emacs after loading some images. */ |
| 8782 | image_types = NULL; | 8782 | image_types = NULL; |
| 8783 | 8783 | ||
| 8784 | /* Must be defined now becase we're going to update it below, while | 8784 | /* Must be defined now because we're going to update it below, while |
| 8785 | defining the supported image types. */ | 8785 | defining the supported image types. */ |
| 8786 | DEFVAR_LISP ("image-types", Vimage_types, | 8786 | DEFVAR_LISP ("image-types", Vimage_types, |
| 8787 | doc: /* List of potentially supported image types. | 8787 | doc: /* List of potentially supported image types. |
diff --git a/src/indent.c b/src/indent.c index a70b7971b96..07a54c0c1b7 100644 --- a/src/indent.c +++ b/src/indent.c | |||
| @@ -1675,7 +1675,7 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_ | |||
| 1675 | val_compute_motion.prevhpos = contin_hpos; | 1675 | val_compute_motion.prevhpos = contin_hpos; |
| 1676 | else | 1676 | else |
| 1677 | val_compute_motion.prevhpos = prev_hpos; | 1677 | val_compute_motion.prevhpos = prev_hpos; |
| 1678 | /* We alalways handle all of them here; none of them remain to do. */ | 1678 | /* We always handle all of them here; none of them remain to do. */ |
| 1679 | val_compute_motion.ovstring_chars_done = 0; | 1679 | val_compute_motion.ovstring_chars_done = 0; |
| 1680 | 1680 | ||
| 1681 | /* Nonzero if have just continued a line */ | 1681 | /* Nonzero if have just continued a line */ |
diff --git a/src/keyboard.c b/src/keyboard.c index fb989d3ea95..87dd2b0e251 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1060,7 +1060,7 @@ cmd_error_internal (Lisp_Object data, const char *context) | |||
| 1060 | struct frame *sf = SELECTED_FRAME (); | 1060 | struct frame *sf = SELECTED_FRAME (); |
| 1061 | 1061 | ||
| 1062 | /* The immediate context is not interesting for Quits, | 1062 | /* The immediate context is not interesting for Quits, |
| 1063 | since they are asyncronous. */ | 1063 | since they are asynchronous. */ |
| 1064 | if (EQ (XCAR (data), Qquit)) | 1064 | if (EQ (XCAR (data), Qquit)) |
| 1065 | Vsignaling_function = Qnil; | 1065 | Vsignaling_function = Qnil; |
| 1066 | 1066 | ||
diff --git a/src/nsterm.m b/src/nsterm.m index 3d3723fc28c..7d26cba6d73 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -3035,7 +3035,7 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) | |||
| 3035 | /* Currently on NS img->mask is always 0. Since | 3035 | /* Currently on NS img->mask is always 0. Since |
| 3036 | get_window_cursor_type specifies a hollow box cursor when on | 3036 | get_window_cursor_type specifies a hollow box cursor when on |
| 3037 | a non-masked image we never reach this clause. But we put it | 3037 | a non-masked image we never reach this clause. But we put it |
| 3038 | in in antipication of better support for image masks on | 3038 | in in anticipation of better support for image masks on |
| 3039 | NS. */ | 3039 | NS. */ |
| 3040 | tdCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f); | 3040 | tdCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f); |
| 3041 | } | 3041 | } |
diff --git a/src/sound.c b/src/sound.c index 362c04b7d40..39007574afc 100644 --- a/src/sound.c +++ b/src/sound.c | |||
| @@ -226,7 +226,7 @@ struct sound_device | |||
| 226 | /* Close device SD. */ | 226 | /* Close device SD. */ |
| 227 | void (* close) (struct sound_device *sd); | 227 | void (* close) (struct sound_device *sd); |
| 228 | 228 | ||
| 229 | /* Configure SD accoring to device-dependent parameters. */ | 229 | /* Configure SD according to device-dependent parameters. */ |
| 230 | void (* configure) (struct sound_device *device); | 230 | void (* configure) (struct sound_device *device); |
| 231 | 231 | ||
| 232 | /* Choose a device-dependent format for outputting sound S. */ | 232 | /* Choose a device-dependent format for outputting sound S. */ |
diff --git a/src/w32fns.c b/src/w32fns.c index ffbcff86694..b4166cbf691 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -2088,7 +2088,7 @@ w32_key_to_modifier (int key) | |||
| 2088 | key_mapping = Qnil; | 2088 | key_mapping = Qnil; |
| 2089 | } | 2089 | } |
| 2090 | 2090 | ||
| 2091 | /* NB. This code runs in the input thread, asychronously to the lisp | 2091 | /* NB. This code runs in the input thread, asynchronously to the lisp |
| 2092 | thread, so we must be careful to ensure access to lisp data is | 2092 | thread, so we must be careful to ensure access to lisp data is |
| 2093 | thread-safe. The following code is safe because the modifier | 2093 | thread-safe. The following code is safe because the modifier |
| 2094 | variable values are updated atomically from lisp and symbols are | 2094 | variable values are updated atomically from lisp and symbols are |
diff --git a/src/w32font.c b/src/w32font.c index 365f8b78a5e..2088af2fbe7 100644 --- a/src/w32font.c +++ b/src/w32font.c | |||
| @@ -1492,7 +1492,7 @@ check_face_name (LOGFONT *font, char *full_name) | |||
| 1492 | 1492 | ||
| 1493 | 1493 | ||
| 1494 | /* Callback function for EnumFontFamiliesEx. | 1494 | /* Callback function for EnumFontFamiliesEx. |
| 1495 | * Checks if a font matches everything we are trying to check agaist, | 1495 | * Checks if a font matches everything we are trying to check against, |
| 1496 | * and if so, adds it to a list. Both the data we are checking against | 1496 | * and if so, adds it to a list. Both the data we are checking against |
| 1497 | * and the list to which the fonts are added are passed in via the | 1497 | * and the list to which the fonts are added are passed in via the |
| 1498 | * lparam argument, in the form of a font_callback_data struct. */ | 1498 | * lparam argument, in the form of a font_callback_data struct. */ |
diff --git a/src/w32menu.c b/src/w32menu.c index c31a8c1fd96..39d101e7bd5 100644 --- a/src/w32menu.c +++ b/src/w32menu.c | |||
| @@ -1443,7 +1443,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) | |||
| 1443 | out_string = (char *) local_alloc (strlen (wv->name) + 1); | 1443 | out_string = (char *) local_alloc (strlen (wv->name) + 1); |
| 1444 | strcpy (out_string, wv->name); | 1444 | strcpy (out_string, wv->name); |
| 1445 | #ifdef MENU_DEBUG | 1445 | #ifdef MENU_DEBUG |
| 1446 | DebPrint ("Menu: allocing %ld for owner-draw", out_string); | 1446 | DebPrint ("Menu: allocating %ld for owner-draw", out_string); |
| 1447 | #endif | 1447 | #endif |
| 1448 | fuFlags = MF_OWNERDRAW | MF_DISABLED; | 1448 | fuFlags = MF_OWNERDRAW | MF_DISABLED; |
| 1449 | } | 1449 | } |
diff --git a/src/w32term.c b/src/w32term.c index e2a06446976..e9fa16ba325 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -5691,7 +5691,7 @@ x_make_frame_visible (struct frame *f) | |||
| 5691 | f->output_data.w32->asked_for_visible = 1; | 5691 | f->output_data.w32->asked_for_visible = 1; |
| 5692 | 5692 | ||
| 5693 | /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL | 5693 | /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL |
| 5694 | causes unexpected behaviour when unminimizing frames that were | 5694 | causes unexpected behavior when unminimizing frames that were |
| 5695 | previously maximised. But only SW_SHOWNORMAL works properly for | 5695 | previously maximised. But only SW_SHOWNORMAL works properly for |
| 5696 | frames that were truely hidden (using make-frame-invisible), so | 5696 | frames that were truely hidden (using make-frame-invisible), so |
| 5697 | we need it to avoid Bug#5482. It seems that async_iconified | 5697 | we need it to avoid Bug#5482. It seems that async_iconified |