diff options
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 3283fd4dfe4..d53321306db 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -6025,7 +6025,7 @@ parse_modifiers_uncached (Lisp_Object symbol, int *modifier_end) #define MULTI_LETTER_MOD(BIT, NAME, LEN) \ if (i + LEN + 1 <= SBYTES (name) \ - && ! strncmp (SDATA (name) + i, NAME, LEN)) \ + && ! strncmp (SSDATA (name) + i, NAME, LEN)) \ { \ this_mod_end = i + LEN; \ this_mod = BIT; \ @@ -6063,13 +6063,13 @@ parse_modifiers_uncached (Lisp_Object symbol, int *modifier_end) if (! (modifiers & (down_modifier | drag_modifier | double_modifier | triple_modifier)) && i + 7 == SBYTES (name) - && strncmp (SDATA (name) + i, "mouse-", 6) == 0 + && strncmp (SSDATA (name) + i, "mouse-", 6) == 0 && ('0' <= SREF (name, i + 6) && SREF (name, i + 6) <= '9')) modifiers |= click_modifier; if (! (modifiers & (double_modifier | triple_modifier)) && i + 6 < SBYTES (name) - && strncmp (SDATA (name) + i, "wheel-", 6) == 0) + && strncmp (SSDATA (name) + i, "wheel-", 6) == 0) modifiers |= click_modifier; if (modifier_end) @@ -6187,7 +6187,7 @@ parse_modifiers (Lisp_Object symbol) Lisp_Object unmodified; Lisp_Object mask; - unmodified = Fintern (make_string (SDATA (SYMBOL_NAME (symbol)) + end, + unmodified = Fintern (make_string (SSDATA (SYMBOL_NAME (symbol)) + end, SBYTES (SYMBOL_NAME (symbol)) - end), Qnil); @@ -6255,7 +6255,7 @@ apply_modifiers (int modifiers, Lisp_Object base) { /* We have to create the symbol ourselves. */ new_symbol = apply_modifiers_uncached (modifiers, - SDATA (SYMBOL_NAME (base)), + SSDATA (SYMBOL_NAME (base)), SCHARS (SYMBOL_NAME (base)), SBYTES (SYMBOL_NAME (base))); @@ -8084,7 +8084,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item) item = XCDR (item); if (!CONSP (item)) { - if (menu_separator_name_p (SDATA (caption))) + if (menu_separator_name_p (SSDATA (caption))) { PROP (TOOL_BAR_ITEM_TYPE) = Qt; #if !defined (USE_GTK) && !defined (HAVE_NS) @@ -8439,7 +8439,7 @@ read_char_minibuf_menu_prompt (int commandflag, int nmaps, Lisp_Object *maps) menu = read_char_minibuf_menu_text; /* Prompt string always starts with map's prompt, and a space. */ - strcpy (menu, SDATA (name)); + strcpy (menu, SSDATA (name)); nlength = SBYTES (name); menu[nlength++] = ':'; menu[nlength++] = ' '; @@ -10562,7 +10562,7 @@ If FILE is nil, close any open dribble file. */) if (!NILP (file)) { file = Fexpand_file_name (file, Qnil); - dribble = fopen (SDATA (file), "w"); + dribble = fopen (SSDATA (file), "w"); if (dribble == 0) report_file_error ("Opening dribble", Fcons (file, Qnil)); } |