aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn2002-07-19 14:27:28 +0000
committerKen Raeburn2002-07-19 14:27:28 +0000
commit53c208f6a2bc27be38c01933e9cf521ed703eb8f (patch)
tree89e545e2555177ee03b8953478d31ca16fef3ff8 /src
parent2e567bd3ecb3e5bf61c7a6d349b8ff944390aca0 (diff)
downloademacs-53c208f6a2bc27be38c01933e9cf521ed703eb8f.tar.gz
emacs-53c208f6a2bc27be38c01933e9cf521ed703eb8f.zip
(may_use_scalable_font_p): Argument now points to
const. (x_face_list_fonts, x_update_menu_appearance): (hash_string_case_insensitive): Treat Lisp string contents as const.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index c6496aa1bd2..83e0efcc656 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -484,7 +484,7 @@ struct table_entry;
484static void map_tty_color P_ ((struct frame *, struct face *, 484static void map_tty_color P_ ((struct frame *, struct face *,
485 enum lface_attribute_index, int *)); 485 enum lface_attribute_index, int *));
486static Lisp_Object resolve_face_name P_ ((Lisp_Object)); 486static Lisp_Object resolve_face_name P_ ((Lisp_Object));
487static int may_use_scalable_font_p P_ ((char *)); 487static int may_use_scalable_font_p P_ ((const char *));
488static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object)); 488static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object));
489static int better_font_p P_ ((int *, struct font_name *, struct font_name *, 489static int better_font_p P_ ((int *, struct font_name *, struct font_name *,
490 int, int)); 490 int, int));
@@ -2476,7 +2476,7 @@ x_face_list_fonts (f, pattern, fonts, nfonts, try_alternatives_p)
2476 for (tem = lfonts; CONSP (tem) && n < nfonts; tem = XCDR (tem)) 2476 for (tem = lfonts; CONSP (tem) && n < nfonts; tem = XCDR (tem))
2477 { 2477 {
2478 Lisp_Object elt, tail; 2478 Lisp_Object elt, tail;
2479 char *name = SDATA (XCAR (tem)); 2479 const char *name = SDATA (XCAR (tem));
2480 2480
2481 /* Ignore fonts matching a pattern from face-ignored-fonts. */ 2481 /* Ignore fonts matching a pattern from face-ignored-fonts. */
2482 for (tail = Vface_ignored_fonts; CONSP (tail); tail = XCDR (tail)) 2482 for (tail = Vface_ignored_fonts; CONSP (tail); tail = XCDR (tail))
@@ -4528,7 +4528,7 @@ x_update_menu_appearance (f)
4528 char line[512]; 4528 char line[512];
4529 Lisp_Object lface = lface_from_face_name (f, Qmenu, 1); 4529 Lisp_Object lface = lface_from_face_name (f, Qmenu, 1);
4530 struct face *face = FACE_FROM_ID (f, MENU_FACE_ID); 4530 struct face *face = FACE_FROM_ID (f, MENU_FACE_ID);
4531 char *myname = SDATA (Vx_resource_name); 4531 const char *myname = SDATA (Vx_resource_name);
4532 int changed_p = 0; 4532 int changed_p = 0;
4533#ifdef USE_MOTIF 4533#ifdef USE_MOTIF
4534 const char *popup_path = "popup_menu"; 4534 const char *popup_path = "popup_menu";
@@ -4939,7 +4939,7 @@ static INLINE unsigned
4939hash_string_case_insensitive (string) 4939hash_string_case_insensitive (string)
4940 Lisp_Object string; 4940 Lisp_Object string;
4941{ 4941{
4942 unsigned char *s; 4942 const unsigned char *s;
4943 unsigned hash = 0; 4943 unsigned hash = 0;
4944 xassert (STRINGP (string)); 4944 xassert (STRINGP (string));
4945 for (s = SDATA (string); *s; ++s) 4945 for (s = SDATA (string); *s; ++s)
@@ -6126,7 +6126,7 @@ build_scalable_font_name (f, font, specified_pt)
6126 6126
6127static int 6127static int
6128may_use_scalable_font_p (font) 6128may_use_scalable_font_p (font)
6129 char *font; 6129 const char *font;
6130{ 6130{
6131 if (EQ (Vscalable_fonts_allowed, Qt)) 6131 if (EQ (Vscalable_fonts_allowed, Qt))
6132 return 1; 6132 return 1;