aboutsummaryrefslogtreecommitdiffstats
path: root/src/font.c
diff options
context:
space:
mode:
authorDan Nicolaescu2010-08-08 14:03:45 -0700
committerDan Nicolaescu2010-08-08 14:03:45 -0700
commit675e2c697bc8a0ff827fcb33297f63f4cc7ecad3 (patch)
tree5b0adfdb3d4cce40512b0fad0de9088d21dfb694 /src/font.c
parent25717ca11cae32e191e3dc9318562190d682f425 (diff)
downloademacs-675e2c697bc8a0ff827fcb33297f63f4cc7ecad3.tar.gz
emacs-675e2c697bc8a0ff827fcb33297f63f4cc7ecad3.zip
Use const char* instead of char*.
* src/xterm.c (x_create_toolkit_scroll_bar): * src/xfont.c (xfont_list_pattern): * src/xfns.c (x_default_scroll_bar_color_parameter) (xic_create_fontsetname, x_default_font_parameter) (x_screen_planes): * src/xdisp.c (c_string_pos, number_of_chars, reseat_to_string) (store_mode_line_string, decode_mode_spec, display_string): * src/menu.c (digest_single_submenu): * src/keymap.h (initial_define_key, initial_define_lispy_key): * src/keymap.c (initial_define_key, initial_define_lispy_key): * src/image.c (image_error, image_keyword): * src/gtkutil.h (xg_create_widget, xg_create_scroll_bar): * src/gtkutil.c (xg_create_widget, xg_create_scroll_bar): * src/ftfont.c (struct fc_charset_table, ftfont_spec_pattern) (ftfont_list, ftfont_match): * src/frame.c (frame_parm_table): * src/font.h (font_intern_prop, font_parse_xlfd, font_parse_fcname) (font_unparse_fcname, font_unparse_fcname, font_open_by_name) (font_add_log, font_deferred_log): * src/font.c (font_intern_prop, font_parse_xlfd, font_parse_fcname) (font_unparse_fcname, font_unparse_fcname, font_open_by_name) (font_add_log, font_deferred_log): * src/emacs.c (argmatch): * src/dispextern.h (struct it): * src/coding.c (ENCODE_DESIGNATION): * src/charset.c (define_charset_internal): Use const.
Diffstat (limited to 'src/font.c')
-rw-r--r--src/font.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/font.c b/src/font.c
index 4b59d89b884..f902ff4c588 100644
--- a/src/font.c
+++ b/src/font.c
@@ -232,7 +232,7 @@ static int num_font_drivers;
232 STR. */ 232 STR. */
233 233
234Lisp_Object 234Lisp_Object
235font_intern_prop (char *str, int len, int force_symbol) 235font_intern_prop (const char *str, int len, int force_symbol)
236{ 236{
237 int i; 237 int i;
238 Lisp_Object tem; 238 Lisp_Object tem;
@@ -981,7 +981,7 @@ font_expand_wildcards (Lisp_Object *field, int n)
981 a fully specified XLFD. */ 981 a fully specified XLFD. */
982 982
983int 983int
984font_parse_xlfd (char *name, Lisp_Object font) 984font_parse_xlfd (const char *name, Lisp_Object font)
985{ 985{
986 int len = strlen (name); 986 int len = strlen (name);
987 int i, j, n; 987 int i, j, n;
@@ -1306,7 +1306,7 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
1306 This function tries to guess which format it is. */ 1306 This function tries to guess which format it is. */
1307 1307
1308int 1308int
1309font_parse_fcname (char *name, Lisp_Object font) 1309font_parse_fcname (const char *name, Lisp_Object font)
1310{ 1310{
1311 char *p, *q; 1311 char *p, *q;
1312 char *size_beg = NULL, *size_end = NULL; 1312 char *size_beg = NULL, *size_end = NULL;
@@ -1563,7 +1563,7 @@ font_parse_fcname (char *name, Lisp_Object font)
1563 FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead. */ 1563 FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead. */
1564 1564
1565int 1565int
1566font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes) 1566font_unparse_fcname (Lisp_Object font, int pixel_size, const char *name, int nbytes)
1567{ 1567{
1568 Lisp_Object family, foundry; 1568 Lisp_Object family, foundry;
1569 Lisp_Object tail, val; 1569 Lisp_Object tail, val;
@@ -1571,7 +1571,7 @@ font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
1571 int i, len = 1; 1571 int i, len = 1;
1572 char *p; 1572 char *p;
1573 Lisp_Object styles[3]; 1573 Lisp_Object styles[3];
1574 char *style_names[3] = { "weight", "slant", "width" }; 1574 const char *style_names[3] = { "weight", "slant", "width" };
1575 char work[256]; 1575 char work[256];
1576 1576
1577 family = AREF (font, FONT_FAMILY_INDEX); 1577 family = AREF (font, FONT_FAMILY_INDEX);
@@ -3506,7 +3506,7 @@ font_open_by_spec (FRAME_PTR f, Lisp_Object spec)
3506 found, return Qnil. */ 3506 found, return Qnil. */
3507 3507
3508Lisp_Object 3508Lisp_Object
3509font_open_by_name (FRAME_PTR f, char *name) 3509font_open_by_name (FRAME_PTR f, const char *name)
3510{ 3510{
3511 Lisp_Object args[2]; 3511 Lisp_Object args[2];
3512 Lisp_Object spec, ret; 3512 Lisp_Object spec, ret;
@@ -5060,7 +5060,7 @@ static Lisp_Object Vfont_log_deferred;
5060 opening), ARG is the argument for the action, and RESULT is the 5060 opening), ARG is the argument for the action, and RESULT is the
5061 result of the action. */ 5061 result of the action. */
5062void 5062void
5063font_add_log (char *action, Lisp_Object arg, Lisp_Object result) 5063font_add_log (const char *action, Lisp_Object arg, Lisp_Object result)
5064{ 5064{
5065 Lisp_Object tail, val; 5065 Lisp_Object tail, val;
5066 int i; 5066 int i;
@@ -5146,7 +5146,7 @@ font_add_log (char *action, Lisp_Object arg, Lisp_Object result)
5146 as font_add_log. */ 5146 as font_add_log. */
5147 5147
5148void 5148void
5149font_deferred_log (char *action, Lisp_Object arg, Lisp_Object result) 5149font_deferred_log (const char *action, Lisp_Object arg, Lisp_Object result)
5150{ 5150{
5151 if (EQ (Vfont_log, Qt)) 5151 if (EQ (Vfont_log, Qt))
5152 return; 5152 return;