summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-11-14 15:59:56 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-11-14 15:59:56 -0800
commit91af3942e9ab5540b3ab4dde6733bc883dc2abdd (patch)
tree7a83e35278714a4498663fc968d36210d8c6436e /src
parent5ef215d87480e348e432b4e323b1ba24e27ebf81 (diff)
Spelling fixes.
Diffstat (limited to 'src')
-rw-r--r--src/alloc.c2
-rw-r--r--src/bytecode.c2
-rw-r--r--src/coding.h2
-rw-r--r--src/emacs.c2
-rw-r--r--src/font.c2
-rw-r--r--src/image.c2
-rw-r--r--src/indent.c2
-rw-r--r--src/keyboard.c2
-rw-r--r--src/nsterm.m2
-rw-r--r--src/sound.c2
-rw-r--r--src/w32fns.c2
-rw-r--r--src/w32font.c2
-rw-r--r--src/w32menu.c2
-rw-r--r--src/w32term.c2
14 files changed, 14 insertions, 14 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 985e4b7142..1d274e2111 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -882,7 +882,7 @@ safe_alloca_unwind (Lisp_Object arg)
/* Like malloc but used for allocating Lisp data. NBYTES is the
number of bytes to allocate, TYPE describes the intended use of the
- allcated memory block (for strings, for conses, ...). */
+ allocated memory block (for strings, for conses, ...). */
#ifndef USE_LSB_TAG
static void *lisp_malloc_loser;
diff --git a/src/bytecode.c b/src/bytecode.c
index 91d360bec1..3af0abd63c 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -271,7 +271,7 @@ struct byte_stack
/* A list of currently active byte-code execution value stacks.
Fbyte_code adds an entry to the head of this list before it starts
processing byte-code, and it removed the entry again when it is
- done. Signaling an error truncates the list analoguous to
+ done. Signaling an error truncates the list analogous to
gcprolist. */
struct byte_stack *byte_stack_list;
diff --git a/src/coding.h b/src/coding.h
index fdf9b762e7..2621928adc 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -518,7 +518,7 @@ struct coding_system
#define CODING_REQUIRE_DETECTION_MASK 0x1000
#define CODING_RESET_AT_BOL_MASK 0x2000
-/* Return 1 if the coding context CODING requires annotaion
+/* Return 1 if the coding context CODING requires annotation
handling. */
#define CODING_REQUIRE_ANNOTATION(coding) \
((coding)->common_flags & CODING_ANNOTATION_MASK)
diff --git a/src/emacs.c b/src/emacs.c
index 12be7bc080..529fa35a5b 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
#endif
/* argmatch must not be used after here,
- except when bulding temacs
+ except when building temacs
because the -d argument has not been skipped in skip_args. */
#ifdef MSDOS
diff --git a/src/font.c b/src/font.c
index ead8225471..3fc5fc944b 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
the table by a character gives the corresponding glyph code.
REPERTORY specifies a repertory of characters supported by the font.
-If REPERTORY is a charset, all characters beloging to the charset are
+If REPERTORY is a charset, all characters belonging to the charset are
supported. If REPERTORY is a char-table, all characters who have a
non-nil value in the table are supported. If REPERTORY is nil, Emacs
gets the repertory information by an opened font and ENCODING. */);
diff --git a/src/image.c b/src/image.c
index 1869b83ac2..8b64bdf20b 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8781,7 +8781,7 @@ syms_of_image (void)
operation on GNU/Linux of calling dump-emacs after loading some images. */
image_types = NULL;
- /* Must be defined now becase we're going to update it below, while
+ /* Must be defined now because we're going to update it below, while
defining the supported image types. */
DEFVAR_LISP ("image-types", Vimage_types,
doc: /* List of potentially supported image types.
diff --git a/src/indent.c b/src/indent.c
index a70b7971b9..07a54c0c1b 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_
val_compute_motion.prevhpos = contin_hpos;
else
val_compute_motion.prevhpos = prev_hpos;
- /* We alalways handle all of them here; none of them remain to do. */
+ /* We always handle all of them here; none of them remain to do. */
val_compute_motion.ovstring_chars_done = 0;
/* Nonzero if have just continued a line */
diff --git a/src/keyboard.c b/src/keyboard.c
index fb989d3ea9..87dd2b0e25 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1060,7 +1060,7 @@ cmd_error_internal (Lisp_Object data, const char *context)
struct frame *sf = SELECTED_FRAME ();
/* The immediate context is not interesting for Quits,
- since they are asyncronous. */
+ since they are asynchronous. */
if (EQ (XCAR (data), Qquit))
Vsignaling_function = Qnil;
diff --git a/src/nsterm.m b/src/nsterm.m
index 3d3723fc28..7d26cba6d7 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3035,7 +3035,7 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r)
/* Currently on NS img->mask is always 0. Since
get_window_cursor_type specifies a hollow box cursor when on
a non-masked image we never reach this clause. But we put it
- in in antipication of better support for image masks on
+ in in anticipation of better support for image masks on
NS. */
tdCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f);
}
diff --git a/src/sound.c b/src/sound.c
index 362c04b7d4..39007574af 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -226,7 +226,7 @@ struct sound_device
/* Close device SD. */
void (* close) (struct sound_device *sd);
- /* Configure SD accoring to device-dependent parameters. */
+ /* Configure SD according to device-dependent parameters. */
void (* configure) (struct sound_device *device);
/* Choose a device-dependent format for outputting sound S. */
diff --git a/src/w32fns.c b/src/w32fns.c
index ffbcff8669..b4166cbf69 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2088,7 +2088,7 @@ w32_key_to_modifier (int key)
key_mapping = Qnil;
}
- /* NB. This code runs in the input thread, asychronously to the lisp
+ /* NB. This code runs in the input thread, asynchronously to the lisp
thread, so we must be careful to ensure access to lisp data is
thread-safe. The following code is safe because the modifier
variable values are updated atomically from lisp and symbols are
diff --git a/src/w32font.c b/src/w32font.c
index 365f8b78a5..2088af2fbe 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -1492,7 +1492,7 @@ check_face_name (LOGFONT *font, char *full_name)
/* Callback function for EnumFontFamiliesEx.
- * Checks if a font matches everything we are trying to check agaist,
+ * Checks if a font matches everything we are trying to check against,
* and if so, adds it to a list. Both the data we are checking against
* and the list to which the fonts are added are passed in via the
* lparam argument, in the form of a font_callback_data struct. */
diff --git a/src/w32menu.c b/src/w32menu.c
index c31a8c1fd9..39d101e7bd 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1443,7 +1443,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
out_string = (char *) local_alloc (strlen (wv->name) + 1);
strcpy (out_string, wv->name);
#ifdef MENU_DEBUG
- DebPrint ("Menu: allocing %ld for owner-draw", out_string);
+ DebPrint ("Menu: allocating %ld for owner-draw", out_string);
#endif
fuFlags = MF_OWNERDRAW | MF_DISABLED;
}
diff --git a/src/w32term.c b/src/w32term.c
index e2a0644697..e9fa16ba32 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5691,7 +5691,7 @@ x_make_frame_visible (struct frame *f)
f->output_data.w32->asked_for_visible = 1;
/* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL
- causes unexpected behaviour when unminimizing frames that were
+ causes unexpected behavior when unminimizing frames that were
previously maximised. But only SW_SHOWNORMAL works properly for
frames that were truely hidden (using make-frame-invisible), so
we need it to avoid Bug#5482. It seems that async_iconified