aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-11-30 17:33:05 +0100
committerJuanma Barranquero2011-11-30 17:33:05 +0100
commit5c32d3f2f93edced9c004698eaa2234d809fee02 (patch)
treeeca49b0e0cb0e6cb28de632bf28ceff944825cb3 /src
parent6db4e2d308c3ccef73b61c2f124f446fb367ea70 (diff)
downloademacs-5c32d3f2f93edced9c004698eaa2234d809fee02.tar.gz
emacs-5c32d3f2f93edced9c004698eaa2234d809fee02.zip
Fix typos.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/ftfont.c2
-rw-r--r--src/term.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8becf2b580e..4121da08617 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8688,7 +8688,7 @@
8688 (xg_set_widget_bg): New function. 8688 (xg_set_widget_bg): New function.
8689 (delete_cb): New function. 8689 (delete_cb): New function.
8690 (xg_create_frame_widgets): Connect delete-event to delete_cb. 8690 (xg_create_frame_widgets): Connect delete-event to delete_cb.
8691 Call xg_set_widget_bg. Only set backgrund pixmap for ! HAVE_GTK3 8691 Call xg_set_widget_bg. Only set background pixmap for ! HAVE_GTK3
8692 (xg_set_background_color): Call xg_set_widget_bg. 8692 (xg_set_background_color): Call xg_set_widget_bg.
8693 (xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask. 8693 (xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask.
8694 (xg_create_scroll_bar): vadj is a GtkAdjustment for HAVE_GTK3. 8694 (xg_create_scroll_bar): vadj is a GtkAdjustment for HAVE_GTK3.
diff --git a/src/ftfont.c b/src/ftfont.c
index 5c540f9bf82..c48346b0147 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1462,7 +1462,7 @@ ftfont_get_bitmap (struct font *font, unsigned int code, struct font_bitmap *bit
1462 : ft_face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_LCD_V ? 8 1462 : ft_face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_LCD_V ? 8
1463 : -1); 1463 : -1);
1464 if (bitmap->bits_per_pixel < 0) 1464 if (bitmap->bits_per_pixel < 0)
1465 /* We don't suport that kind of pixel mode. */ 1465 /* We don't support that kind of pixel mode. */
1466 return -1; 1466 return -1;
1467 bitmap->rows = ft_face->glyph->bitmap.rows; 1467 bitmap->rows = ft_face->glyph->bitmap.rows;
1468 bitmap->width = ft_face->glyph->bitmap.width; 1468 bitmap->width = ft_face->glyph->bitmap.width;
diff --git a/src/term.c b/src/term.c
index 4a671d048c4..ae505f020f2 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3236,7 +3236,7 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\
3236 MultiLeft (tty) = tgetstr ("LE", address); 3236 MultiLeft (tty) = tgetstr ("LE", address);
3237 MultiRight (tty) = tgetstr ("RI", address); 3237 MultiRight (tty) = tgetstr ("RI", address);
3238 3238
3239 /* SVr4/ANSI color suppert. If "op" isn't available, don't support 3239 /* SVr4/ANSI color support. If "op" isn't available, don't support
3240 color because we can't switch back to the default foreground and 3240 color because we can't switch back to the default foreground and
3241 background. */ 3241 background. */
3242 tty->TS_orig_pair = tgetstr ("op", address); 3242 tty->TS_orig_pair = tgetstr ("op", address);