/[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.267 by rost, Fri Jul 12 03:37:49 2002 UTC revision 1.268 by raeburn, Mon Jul 15 00:00:36 2002 UTC
# Line 1062  the front of KEYMAP.  */) Line 1062  the front of KEYMAP.  */)
1062          /* We must use Fkey_description rather than just passing key to          /* We must use Fkey_description rather than just passing key to
1063             error; key might be a vector, not a string.  */             error; key might be a vector, not a string.  */
1064          error ("Key sequence %s uses invalid prefix characters",          error ("Key sequence %s uses invalid prefix characters",
1065                 XSTRING (Fkey_description (key))->data);                 SDATA (Fkey_description (key)));
1066      }      }
1067  }  }
1068    
# Line 1223  silly_event_symbol_error (c) Line 1223  silly_event_symbol_error (c)
1223        error ((modifiers & ~meta_modifier        error ((modifiers & ~meta_modifier
1224                ? "To bind the key %s, use [?%s], not [%s]"                ? "To bind the key %s, use [?%s], not [%s]"
1225                : "To bind the key %s, use \"%s\", not [%s]"),                : "To bind the key %s, use \"%s\", not [%s]"),
1226               XSTRING (SYMBOL_NAME (c))->data, XSTRING (keystring)->data,               SDATA (SYMBOL_NAME (c)), SDATA (keystring),
1227               XSTRING (SYMBOL_NAME (c))->data);               SDATA (SYMBOL_NAME (c)));
1228      }      }
1229  }  }
1230    
# Line 1746  then the value includes only maps for pr Line 1746  then the value includes only maps for pr
1746                int i, i_byte, c;                int i, i_byte, c;
1747                Lisp_Object copy;                Lisp_Object copy;
1748    
1749                copy = Fmake_vector (make_number (XSTRING (prefix)->size), Qnil);                copy = Fmake_vector (make_number (SCHARS (prefix)), Qnil);
1750                for (i = 0, i_byte = 0; i < XSTRING (prefix)->size;)                for (i = 0, i_byte = 0; i < SCHARS (prefix);)
1751                  {                  {
1752                    int i_before = i;                    int i_before = i;
1753    
# Line 1876  spaces are put between sequence elements Line 1876  spaces are put between sequence elements
1876      {      {
1877        Lisp_Object vector;        Lisp_Object vector;
1878        vector = Fmake_vector (Flength (keys), Qnil);        vector = Fmake_vector (Flength (keys), Qnil);
1879        for (i = 0, i_byte = 0; i < XSTRING (keys)->size; )        for (i = 0, i_byte = 0; i < SCHARS (keys); )
1880          {          {
1881            int c;            int c;
1882            int i_before = i;            int i_before = i;
# Line 2120  around function keys and event symbols. Line 2120  around function keys and event symbols.
2120        if (NILP (no_angles))        if (NILP (no_angles))
2121          {          {
2122            char *buffer            char *buffer
2123              = (char *) alloca (STRING_BYTES (XSTRING (SYMBOL_NAME (key))) + 5);              = (char *) alloca (SBYTES (SYMBOL_NAME (key)) + 5);
2124            sprintf (buffer, "<%s>", XSTRING (SYMBOL_NAME (key))->data);            sprintf (buffer, "<%s>", SDATA (SYMBOL_NAME (key)));
2125            return build_string (buffer);            return build_string (buffer);
2126          }          }
2127        else        else
# Line 2659  You type        Translation\n\ Line 2659  You type        Translation\n\
2659    if (STRINGP (Vkeyboard_translate_table) && !NILP (prefix))    if (STRINGP (Vkeyboard_translate_table) && !NILP (prefix))
2660      {      {
2661        int c;        int c;
2662        unsigned char *translate = XSTRING (Vkeyboard_translate_table)->data;        unsigned char *translate = SDATA (Vkeyboard_translate_table);
2663        int translate_len = XSTRING (Vkeyboard_translate_table)->size;        int translate_len = SCHARS (Vkeyboard_translate_table);
2664    
2665        for (c = 0; c < translate_len; c++)        for (c = 0; c < translate_len; c++)
2666          if (translate[c] != c)          if (translate[c] != c)
# Line 2738  You type        Translation\n\ Line 2738  You type        Translation\n\
2738            if (!SYMBOLP (modes[i]))            if (!SYMBOLP (modes[i]))
2739              abort();              abort();
2740    
2741            p = title = (char *) alloca (42 + XSTRING (SYMBOL_NAME (modes[i]))->size);            p = title = (char *) alloca (42 + SCHARS (SYMBOL_NAME (modes[i])));
2742            *p++ = '\f';            *p++ = '\f';
2743            *p++ = '\n';            *p++ = '\n';
2744            *p++ = '`';            *p++ = '`';
2745            bcopy (XSTRING (SYMBOL_NAME (modes[i]))->data, p,            bcopy (SDATA (SYMBOL_NAME (modes[i])), p,
2746                   XSTRING (SYMBOL_NAME (modes[i]))->size);                   SCHARS (SYMBOL_NAME (modes[i])));
2747            p += XSTRING (SYMBOL_NAME (modes[i]))->size;            p += SCHARS (SYMBOL_NAME (modes[i]));
2748            *p++ = '\'';            *p++ = '\'';
2749            bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") - 1);            bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") - 1);
2750            p += sizeof (" Minor Mode Bindings") - 1;            p += sizeof (" Minor Mode Bindings") - 1;
# Line 2875  key             binding\n\ Line 2875  key             binding\n\
2875    
2876            /* If the sequence by which we reach this keymap is zero-length,            /* If the sequence by which we reach this keymap is zero-length,
2877               then the shadow map for this keymap is just SHADOW.  */               then the shadow map for this keymap is just SHADOW.  */
2878            if ((STRINGP (prefix) && XSTRING (prefix)->size == 0)            if ((STRINGP (prefix) && SCHARS (prefix) == 0)
2879                || (VECTORP (prefix) && XVECTOR (prefix)->size == 0))                || (VECTORP (prefix) && XVECTOR (prefix)->size == 0))
2880              ;              ;
2881            /* If the sequence by which we reach this keymap actually has            /* If the sequence by which we reach this keymap actually has
# Line 3361  describe_vector (vector, elt_prefix, arg Line 3361  describe_vector (vector, elt_prefix, arg
3361                insert_string ("<");                insert_string ("<");
3362                tem2 = CHARSET_TABLE_INFO (i - 128, CHARSET_SHORT_NAME_IDX);                tem2 = CHARSET_TABLE_INFO (i - 128, CHARSET_SHORT_NAME_IDX);
3363                if (STRINGP (tem2))                if (STRINGP (tem2))
3364                  insert_from_string (tem2, 0, 0, XSTRING (tem2)->size,                  insert_from_string (tem2, 0, 0, SCHARS (tem2),
3365                                      STRING_BYTES (XSTRING (tem2)), 0);                                      SBYTES (tem2), 0);
3366                else                else
3367                  insert ("?", 1);                  insert ("?", 1);
3368                insert (">", 1);                insert (">", 1);

Legend:
Removed from v.1.267  
changed lines
  Added in v.1.268

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