aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfns.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/xfns.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/xfns.c')
-rw-r--r--src/xfns.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xfns.c b/src/xfns.c
index ecf7e150b0c..249aa6998c3 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -501,7 +501,7 @@ void x_set_scroll_bar_background (struct frame *, Lisp_Object,
501static Lisp_Object x_default_scroll_bar_color_parameter (struct frame *, 501static Lisp_Object x_default_scroll_bar_color_parameter (struct frame *,
502 Lisp_Object, 502 Lisp_Object,
503 Lisp_Object, 503 Lisp_Object,
504 char *, char *, 504 const char *, const char *,
505 int); 505 int);
506 506
507 507
@@ -1767,7 +1767,7 @@ x_set_scroll_bar_default_width (struct frame *f)
1767static Lisp_Object 1767static Lisp_Object
1768x_default_scroll_bar_color_parameter (struct frame *f, 1768x_default_scroll_bar_color_parameter (struct frame *f,
1769 Lisp_Object alist, Lisp_Object prop, 1769 Lisp_Object alist, Lisp_Object prop,
1770 char *xprop, char *xclass, 1770 const char *xprop, const char *xclass,
1771 int foreground_p) 1771 int foreground_p)
1772{ 1772{
1773 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); 1773 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
@@ -2138,7 +2138,7 @@ xic_create_xfontset (struct frame *f)
2138 } 2138 }
2139 if (! xfs) 2139 if (! xfs)
2140 { 2140 {
2141 char *last_resort = "-*-*-*-r-normal--*-*-*-*-*-*"; 2141 const char *last_resort = "-*-*-*-r-normal--*-*-*-*-*-*";
2142 2142
2143 missing_list = NULL; 2143 missing_list = NULL;
2144 xfs = XCreateFontSet (FRAME_X_DISPLAY (f), last_resort, 2144 xfs = XCreateFontSet (FRAME_X_DISPLAY (f), last_resort,
@@ -3011,7 +3011,7 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms)
3011 3011
3012 if (! FONTP (font) && ! STRINGP (font)) 3012 if (! FONTP (font) && ! STRINGP (font))
3013 { 3013 {
3014 char *names[] 3014 const char *names[]
3015 = { 3015 = {
3016#ifdef HAVE_XFT 3016#ifdef HAVE_XFT
3017 /* This will find the normal Xft font. */ 3017 /* This will find the normal Xft font. */
@@ -3740,7 +3740,7 @@ If omitted or nil, that stands for the selected frame's display. */)
3740 (Lisp_Object terminal) 3740 (Lisp_Object terminal)
3741{ 3741{
3742 struct x_display_info *dpyinfo = check_x_display_info (terminal); 3742 struct x_display_info *dpyinfo = check_x_display_info (terminal);
3743 char *vendor = ServerVendor (dpyinfo->display); 3743 const char *vendor = ServerVendor (dpyinfo->display);
3744 3744
3745 if (! vendor) vendor = ""; 3745 if (! vendor) vendor = "";
3746 return build_string (vendor); 3746 return build_string (vendor);
@@ -3934,7 +3934,7 @@ x_screen_planes (register struct frame *f)
3934 3934
3935static struct visual_class 3935static struct visual_class
3936{ 3936{
3937 char *name; 3937 const char *name;
3938 int class; 3938 int class;
3939} 3939}
3940visual_classes[] = 3940visual_classes[] =