[Emacs-diffs] Changes to emacs/src/keymap.c

[Ken Raeburn]

Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.267 emacs/src/keymap.c:1.268
*** emacs/src/keymap.c:1.267    Thu Jul 11 23:37:49 2002
--- emacs/src/keymap.c  Sun Jul 14 20:00:36 2002
***************
*** 1062,1068 ****
        /* We must use Fkey_description rather than just passing key to
           error; key might be a vector, not a string.  */
        error ("Key sequence %s uses invalid prefix characters",
!              XSTRING (Fkey_description (key))->data);
      }
  }
  
--- 1062,1068 ----
        /* We must use Fkey_description rather than just passing key to
           error; key might be a vector, not a string.  */
        error ("Key sequence %s uses invalid prefix characters",
!              SDATA (Fkey_description (key)));
      }
  }
  
***************
*** 1223,1230 ****
        error ((modifiers & ~meta_modifier
              ? "To bind the key %s, use [?%s], not [%s]"
              : "To bind the key %s, use \"%s\", not [%s]"),
!            XSTRING (SYMBOL_NAME (c))->data, XSTRING (keystring)->data,
!            XSTRING (SYMBOL_NAME (c))->data);
      }
  }
  
--- 1223,1230 ----
        error ((modifiers & ~meta_modifier
              ? "To bind the key %s, use [?%s], not [%s]"
              : "To bind the key %s, use \"%s\", not [%s]"),
!            SDATA (SYMBOL_NAME (c)), SDATA (keystring),
!            SDATA (SYMBOL_NAME (c)));
      }
  }
  
***************
*** 1746,1753 ****
              int i, i_byte, c;
              Lisp_Object copy;
  
!             copy = Fmake_vector (make_number (XSTRING (prefix)->size), Qnil);
!             for (i = 0, i_byte = 0; i < XSTRING (prefix)->size;)
                {
                  int i_before = i;
  
--- 1746,1753 ----
              int i, i_byte, c;
              Lisp_Object copy;
  
!             copy = Fmake_vector (make_number (SCHARS (prefix)), Qnil);
!             for (i = 0, i_byte = 0; i < SCHARS (prefix);)
                {
                  int i_before = i;
  
***************
*** 1876,1882 ****
      {
        Lisp_Object vector;
        vector = Fmake_vector (Flength (keys), Qnil);
!       for (i = 0, i_byte = 0; i < XSTRING (keys)->size; )
        {
          int c;
          int i_before = i;
--- 1876,1882 ----
      {
        Lisp_Object vector;
        vector = Fmake_vector (Flength (keys), Qnil);
!       for (i = 0, i_byte = 0; i < SCHARS (keys); )
        {
          int c;
          int i_before = i;
***************
*** 2120,2127 ****
        if (NILP (no_angles))
        {
          char *buffer
!           = (char *) alloca (STRING_BYTES (XSTRING (SYMBOL_NAME (key))) + 5);
!         sprintf (buffer, "<%s>", XSTRING (SYMBOL_NAME (key))->data);
          return build_string (buffer);
        }
        else
--- 2120,2127 ----
        if (NILP (no_angles))
        {
          char *buffer
!           = (char *) alloca (SBYTES (SYMBOL_NAME (key)) + 5);
!         sprintf (buffer, "<%s>", SDATA (SYMBOL_NAME (key)));
          return build_string (buffer);
        }
        else
***************
*** 2659,2666 ****
    if (STRINGP (Vkeyboard_translate_table) && !NILP (prefix))
      {
        int c;
!       unsigned char *translate = XSTRING (Vkeyboard_translate_table)->data;
!       int translate_len = XSTRING (Vkeyboard_translate_table)->size;
  
        for (c = 0; c < translate_len; c++)
        if (translate[c] != c)
--- 2659,2666 ----
    if (STRINGP (Vkeyboard_translate_table) && !NILP (prefix))
      {
        int c;
!       unsigned char *translate = SDATA (Vkeyboard_translate_table);
!       int translate_len = SCHARS (Vkeyboard_translate_table);
  
        for (c = 0; c < translate_len; c++)
        if (translate[c] != c)
***************
*** 2738,2750 ****
          if (!SYMBOLP (modes[i]))
            abort();
  
!         p = title = (char *) alloca (42 + XSTRING (SYMBOL_NAME 
(modes[i]))->size);
          *p++ = '\f';
          *p++ = '\n';
          *p++ = '`';
!         bcopy (XSTRING (SYMBOL_NAME (modes[i]))->data, p,
!                XSTRING (SYMBOL_NAME (modes[i]))->size);
!         p += XSTRING (SYMBOL_NAME (modes[i]))->size;
          *p++ = '\'';
          bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") - 
1);
          p += sizeof (" Minor Mode Bindings") - 1;
--- 2738,2750 ----
          if (!SYMBOLP (modes[i]))
            abort();
  
!         p = title = (char *) alloca (42 + SCHARS (SYMBOL_NAME (modes[i])));
          *p++ = '\f';
          *p++ = '\n';
          *p++ = '`';
!         bcopy (SDATA (SYMBOL_NAME (modes[i])), p,
!                SCHARS (SYMBOL_NAME (modes[i])));
!         p += SCHARS (SYMBOL_NAME (modes[i]));
          *p++ = '\'';
          bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") - 
1);
          p += sizeof (" Minor Mode Bindings") - 1;
***************
*** 2875,2881 ****
  
          /* If the sequence by which we reach this keymap is zero-length,
             then the shadow map for this keymap is just SHADOW.  */
!         if ((STRINGP (prefix) && XSTRING (prefix)->size == 0)
              || (VECTORP (prefix) && XVECTOR (prefix)->size == 0))
            ;
          /* If the sequence by which we reach this keymap actually has
--- 2875,2881 ----
  
          /* If the sequence by which we reach this keymap is zero-length,
             then the shadow map for this keymap is just SHADOW.  */
!         if ((STRINGP (prefix) && SCHARS (prefix) == 0)
              || (VECTORP (prefix) && XVECTOR (prefix)->size == 0))
            ;
          /* If the sequence by which we reach this keymap actually has
***************
*** 3361,3368 ****
              insert_string ("<");
              tem2 = CHARSET_TABLE_INFO (i - 128, CHARSET_SHORT_NAME_IDX);
              if (STRINGP (tem2))
!               insert_from_string (tem2, 0, 0, XSTRING (tem2)->size,
!                                   STRING_BYTES (XSTRING (tem2)), 0);
              else
                insert ("?", 1);
              insert (">", 1);
--- 3361,3368 ----
              insert_string ("<");
              tem2 = CHARSET_TABLE_INFO (i - 128, CHARSET_SHORT_NAME_IDX);
              if (STRINGP (tem2))
!               insert_from_string (tem2, 0, 0, SCHARS (tem2),
!                                   SBYTES (tem2), 0);
              else
                insert ("?", 1);
              insert (">", 1);