/[emacs]/emacs/src/keymap.c
ViewVC logotype

Diff of /emacs/src/keymap.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.261 by monnier, Tue May 14 03:04:24 2002 UTC revision 1.262 by raeburn, Mon May 20 08:06:00 2002 UTC
# Line 1221  silly_event_symbol_error (c) Line 1221  silly_event_symbol_error (c)
1221        error ((modifiers & ~meta_modifier        error ((modifiers & ~meta_modifier
1222                ? "To bind the key %s, use [?%s], not [%s]"                ? "To bind the key %s, use [?%s], not [%s]"
1223                : "To bind the key %s, use \"%s\", not [%s]"),                : "To bind the key %s, use \"%s\", not [%s]"),
1224               XSYMBOL (c)->name->data, XSTRING (keystring)->data,               XSTRING (SYMBOL_NAME (c))->data, XSTRING (keystring)->data,
1225               XSYMBOL (c)->name->data);               XSTRING (SYMBOL_NAME (c))->data);
1226      }      }
1227  }  }
1228    
# Line 2118  around function keys and event symbols. Line 2118  around function keys and event symbols.
2118        if (NILP (no_angles))        if (NILP (no_angles))
2119          {          {
2120            char *buffer            char *buffer
2121              = (char *) alloca (STRING_BYTES (XSYMBOL (key)->name) + 5);              = (char *) alloca (STRING_BYTES (XSTRING (SYMBOL_NAME (key))) + 5);
2122            sprintf (buffer, "<%s>", XSYMBOL (key)->name->data);            sprintf (buffer, "<%s>", XSTRING (SYMBOL_NAME (key))->data);
2123            return build_string (buffer);            return build_string (buffer);
2124          }          }
2125        else        else
# Line 2736  You type        Translation\n\ Line 2736  You type        Translation\n\
2736            if (!SYMBOLP (modes[i]))            if (!SYMBOLP (modes[i]))
2737              abort();              abort();
2738    
2739            p = title = (char *) alloca (42 + XSYMBOL (modes[i])->name->size);            p = title = (char *) alloca (42 + XSTRING (SYMBOL_NAME (modes[i]))->size);
2740            *p++ = '\f';            *p++ = '\f';
2741            *p++ = '\n';            *p++ = '\n';
2742            *p++ = '`';            *p++ = '`';
2743            bcopy (XSYMBOL (modes[i])->name->data, p,            bcopy (XSTRING (SYMBOL_NAME (modes[i]))->data, p,
2744                   XSYMBOL (modes[i])->name->size);                   XSTRING (SYMBOL_NAME (modes[i]))->size);
2745            p += XSYMBOL (modes[i])->name->size;            p += XSTRING (SYMBOL_NAME (modes[i]))->size;
2746            *p++ = '\'';            *p++ = '\'';
2747            bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") - 1);            bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") - 1);
2748            p += sizeof (" Minor Mode Bindings") - 1;            p += sizeof (" Minor Mode Bindings") - 1;
# Line 2945  describe_command (definition, args) Line 2945  describe_command (definition, args)
2945    
2946    if (SYMBOLP (definition))    if (SYMBOLP (definition))
2947      {      {
2948        XSETSTRING (tem1, XSYMBOL (definition)->name);        tem1 = SYMBOL_NAME (definition);
2949        insert1 (tem1);        insert1 (tem1);
2950        insert_string ("\n");        insert_string ("\n");
2951      }      }
# Line 2967  describe_translation (definition, args) Line 2967  describe_translation (definition, args)
2967    
2968    if (SYMBOLP (definition))    if (SYMBOLP (definition))
2969      {      {
2970        XSETSTRING (tem1, XSYMBOL (definition)->name);        tem1 = SYMBOL_NAME (definition);
2971        insert1 (tem1);        insert1 (tem1);
2972        insert_string ("\n");        insert_string ("\n");
2973      }      }

Legend:
Removed from v.1.261  
changed lines
  Added in v.1.262

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26