Commit 24021b38 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

Add const to array elements.

* keyboard.c (modify_event_symbol) : Add const to array elements of arg NAME_TABLE.
(lispy_accent_keys, lispy_function_keys, lispy_multimedia_keys)
(lispy_kana_keys, iso_lispy_function_keys, lispy_wheel_names)
(lispy_wheel_names, lispy_drag_n_drop_names, modifier_names):
Add const to array elements.
(scroll_bar_parts): Make static.  Fix position of const.

* w32fns.c (lispy_function_keys): Add const to extern.

* w32inevt.c (lispy_function_keys): Likewise.
parent afa42fe3
2010-11-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* keyboard.c (modify_event_symbol) : Add const to array elements of
arg NAME_TABLE.
(lispy_accent_keys, lispy_function_keys, lispy_multimedia_keys)
(lispy_kana_keys, iso_lispy_function_keys, lispy_wheel_names)
(lispy_wheel_names, lispy_drag_n_drop_names, modifier_names):
Add const to array elements.
(scroll_bar_parts): Make static. Fix position of const.
* w32fns.c (lispy_function_keys): Add const to extern.
* w32inevt.c (lispy_function_keys): Likewise.
2010-11-14 Chong Yidong <cyd@stupidchicken.com>
* xfns.c (Fx_create_frame): Don't check for the cursorColor
......
......@@ -620,7 +620,7 @@ static Lisp_Object make_lispy_movement (struct frame *, Lisp_Object,
unsigned long);
#endif
static Lisp_Object modify_event_symbol (EMACS_INT, unsigned, Lisp_Object,
Lisp_Object, const char **,
Lisp_Object, const char *const *,
Lisp_Object *, unsigned);
static Lisp_Object make_lispy_switch_frame (Lisp_Object);
static void save_getcjmp (jmp_buf);
......@@ -4752,7 +4752,7 @@ static const int lispy_accent_codes[] =
/* This is a list of Lisp names for special "accent" characters.
It parallels lispy_accent_codes. */
static const char *lispy_accent_keys[] =
static const char *const lispy_accent_keys[] =
{
"dead-circumflex",
"dead-grave",
......@@ -4779,7 +4779,7 @@ static const char *lispy_accent_keys[] =
#ifdef HAVE_NTGUI
#define FUNCTION_KEY_OFFSET 0x0
char const *lispy_function_keys[] =
const char *const lispy_function_keys[] =
{
0, /* 0 */
......@@ -4973,7 +4973,7 @@ char const *lispy_function_keys[] =
/* Some of these duplicate the "Media keys" on newer keyboards,
but they are delivered to the application in a different way. */
static const char *lispy_multimedia_keys[] =
static const char *const lispy_multimedia_keys[] =
{
0,
"browser-back",
......@@ -5037,7 +5037,7 @@ static const char *lispy_multimedia_keys[] =
the XK_kana_A case below. */
#if 0
#ifdef XK_kana_A
static const char *lispy_kana_keys[] =
static const char *const lispy_kana_keys[] =
{
/* X Keysym value */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x400 .. 0x40f */
......@@ -5076,7 +5076,7 @@ static const char *lispy_kana_keys[] =
/* You'll notice that this table is arranged to be conveniently
indexed by X Windows keysym values. */
static const char *lispy_function_keys[] =
static const char *const lispy_function_keys[] =
{
/* X Keysym value */
......@@ -5162,7 +5162,7 @@ static const char *lispy_function_keys[] =
/* ISO 9995 Function and Modifier Keys; the first byte is 0xFE. */
#define ISO_FUNCTION_KEY_OFFSET 0xfe00
static const char *iso_lispy_function_keys[] =
static const char *const iso_lispy_function_keys[] =
{
0, 0, 0, 0, 0, 0, 0, 0, /* 0xfe00 */
0, 0, 0, 0, 0, 0, 0, 0, /* 0xfe08 */
......@@ -5185,14 +5185,14 @@ static const char *iso_lispy_function_keys[] =
Lisp_Object Vlispy_mouse_stem;
static const char *lispy_wheel_names[] =
static const char *const lispy_wheel_names[] =
{
"wheel-up", "wheel-down", "wheel-left", "wheel-right"
};
/* drag-n-drop events are generated when a set of selected files are
dragged from another application and dropped onto an Emacs window. */
static const char *lispy_drag_n_drop_names[] =
static const char *const lispy_drag_n_drop_names[] =
{
"drag-n-drop"
};
......@@ -5203,7 +5203,7 @@ Lisp_Object Qup, Qdown, Qbottom, Qend_scroll;
Lisp_Object Qtop, Qratio;
/* An array of scroll bar parts, indexed by an enum scroll_bar_part value. */
const Lisp_Object *scroll_bar_parts[] = {
static Lisp_Object *const scroll_bar_parts[] = {
&Qabove_handle, &Qhandle, &Qbelow_handle,
&Qup, &Qdown, &Qtop, &Qbottom, &Qend_scroll, &Qratio
};
......@@ -6351,7 +6351,7 @@ apply_modifiers_uncached (int modifiers, char *base, int base_len, int base_len_
}
static const char *modifier_names[] =
static const char *const modifier_names[] =
{
"up", "down", "drag", "click", "double", "triple", 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
......@@ -6571,7 +6571,7 @@ reorder_modifiers (Lisp_Object symbol)
static Lisp_Object
modify_event_symbol (EMACS_INT symbol_num, unsigned int modifiers, Lisp_Object symbol_kind,
Lisp_Object name_alist_or_stem, const char **name_table,
Lisp_Object name_alist_or_stem, const char *const *name_table,
Lisp_Object *symbol_table, unsigned int table_size)
{
Lisp_Object value;
......
......@@ -82,7 +82,7 @@ extern const char *map_w32_filename (const char *, const char **);
extern int quit_char;
extern char *lispy_function_keys[];
extern const char *const lispy_function_keys[];
/* The colormap for converting color names to RGB values */
Lisp_Object Vw32_color_map;
......
......@@ -282,7 +282,7 @@ w32_kbd_patch_key (KEY_EVENT_RECORD *event)
}
extern char *lispy_function_keys[];
extern const char *const lispy_function_keys[];
static int faked_key = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment