summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/ChangeLog.52
-rw-r--r--src/ChangeLog.72
-rw-r--r--src/frame.h2
-rw-r--r--src/image.c2
-rw-r--r--src/keyboard.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 31ecc62ed37..cbdc3706076 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -19181,7 +19181,7 @@
(Ffont_shape_text): New function.
(Fopen_font): If the font size is not given, use 12-pixel.
(Ffont_at): New arg STRING.
- (syms_of_font): Initalize font_charset_alist.
+ (syms_of_font): Initialize font_charset_alist.
Declare Ffont_shape_text as a Lisp function. Call syms_of_XXfont
conditionally.
@@ -20178,7 +20178,7 @@
* font.c (font_unparse_fcname): Fix typo (swidth->width).
(font_list_entities): Check driver_list->on.
- (register_font_driver): Initalize `on' member to 0.
+ (register_font_driver): Initialize `on' member to 0.
(font_update_drivers): New function.
(Fclear_font_cache): Check driver_list->on.
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 9be45e2fc54..cc3fcdd88f2 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -4093,7 +4093,7 @@
* xterm.h: Delete X10 code.
- * xfns.c (Fx_create_frame): Don't increment refernce_count
+ * xfns.c (Fx_create_frame): Don't increment reference_count
until the frame is put on the frame list.
* xterm.c (x_initialize): Init x_noop_count, x_focus_frame
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 6cc3d0f9e3e..7421aba4403 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -1040,7 +1040,7 @@
* lread.c: Remember the last TWO strings skipped with #@.
(prev_saved_doc_string*): New variables.
- (Fload): Initalize prev_saved_doc_string.
+ (Fload): Initialize prev_saved_doc_string.
(read1): Copy saved_doc_string to prev_saved_doc_string
before storing a new string in saved_doc_string.
(read_list): Look in prev_saved_doc_string as well as
diff --git a/src/frame.h b/src/frame.h
index 6b307c7c3b1..e66fd9341c7 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -310,7 +310,7 @@ struct frame
/* Canonical X unit. Width of default font, in pixels. */
int column_width;
- /* Widht of space glyph of default font, in pixels. */
+ /* Width of space glyph of default font, in pixels. */
int space_width;
/* Canonical Y unit. Height of a line, in pixels. */
diff --git a/src/image.c b/src/image.c
index ff0bbc1d688..940959e951a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8626,7 +8626,7 @@ of `image-library-alist', which see). */)
#if defined (HAVE_IMAGEMAGICK)
if (EQ (type, Qimagemagick))
{
- /* MagickWandGenesis() initalizes the imagemagick library. */
+ /* MagickWandGenesis() initializes the imagemagick library. */
MagickWandGenesis ();
return CHECK_LIB_AVAILABLE (&imagemagick_type, init_imagemagick_functions,
libraries);
diff --git a/src/keyboard.c b/src/keyboard.c
index 7321fa4e7a9..50cd49e54cd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3802,7 +3802,7 @@ kbd_buffer_unget_event (register struct input_event *event)
HELP is the help form.
- FRAME and WINDOW are the frame and windoiw where the help is
+ FRAME and WINDOW are the frame and window where the help is
generated. OBJECT is the Lisp object where the help was found (a
buffer, a string, an overlay, or nil if neither from a string nor
from a buffer). POS is the position within OBJECT where the help