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

[Ken Raeburn]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.677 emacs/src/keyboard.c:1.678
*** emacs/src/keyboard.c:1.677  Thu May 16 07:53:41 2002
--- emacs/src/keyboard.c        Mon May 20 04:05:55 2002
***************
*** 741,747 ****
        }
        else if (SYMBOLP (c))
        {
!         struct Lisp_String *name = XSYMBOL (c)->name;
          int nbytes = STRING_BYTES (name);
          
          if (size - (ptr - buffer) < nbytes)
--- 741,747 ----
        }
        else if (SYMBOLP (c))
        {
!         struct Lisp_String *name = XSTRING (SYMBOL_NAME (c));
          int nbytes = STRING_BYTES (name);
          
          if (size - (ptr - buffer) < nbytes)
***************
*** 3139,3146 ****
          if (SYMBOLP (dribblee))
            {
              putc ('<', dribble);
!             fwrite (XSYMBOL (dribblee)->name->data, sizeof (char),
!                     STRING_BYTES (XSYMBOL (dribblee)->name),
                      dribble);
              putc ('>', dribble);
            }
--- 3139,3146 ----
          if (SYMBOLP (dribblee))
            {
              putc ('<', dribble);
!             fwrite (XSTRING (SYMBOL_NAME (dribblee))->data, sizeof (char),
!                     STRING_BYTES (XSTRING (SYMBOL_NAME (dribblee))),
                      dribble);
              putc ('>', dribble);
            }
***************
*** 5527,5533 ****
    CHECK_SYMBOL (symbol);
  
    modifiers = 0;
!   name = XSYMBOL (symbol)->name;
  
    for (i = 0; i+2 <= STRING_BYTES (name); )
      {
--- 5527,5533 ----
    CHECK_SYMBOL (symbol);
  
    modifiers = 0;
!   name = XSTRING (SYMBOL_NAME (symbol));
  
    for (i = 0; i+2 <= STRING_BYTES (name); )
      {
***************
*** 5704,5711 ****
        Lisp_Object unmodified;
        Lisp_Object mask;
  
!       unmodified = Fintern (make_string (XSYMBOL (symbol)->name->data + end,
!                                        STRING_BYTES (XSYMBOL (symbol)->name) 
- end),
                            Qnil);
  
        if (modifiers & ~VALMASK)
--- 5704,5711 ----
        Lisp_Object unmodified;
        Lisp_Object mask;
  
!       unmodified = Fintern (make_string (XSTRING (SYMBOL_NAME (symbol))->data 
+ end,
!                                        STRING_BYTES (XSTRING (SYMBOL_NAME 
(symbol))) - end),
                            Qnil);
  
        if (modifiers & ~VALMASK)
***************
*** 5758,5766 ****
      {
        /* We have to create the symbol ourselves.  */
        new_symbol = apply_modifiers_uncached (modifiers,
!                                            XSYMBOL (base)->name->data,
!                                            XSYMBOL (base)->name->size,
!                                            STRING_BYTES (XSYMBOL 
(base)->name));
  
        /* Add the new symbol to the base's cache.  */
        entry = Fcons (index, new_symbol);
--- 5758,5766 ----
      {
        /* We have to create the symbol ourselves.  */
        new_symbol = apply_modifiers_uncached (modifiers,
!                                            XSTRING (SYMBOL_NAME (base))->data,
!                                            XSTRING (SYMBOL_NAME (base))->size,
!                                            STRING_BYTES (XSTRING (SYMBOL_NAME 
(base))));
  
        /* Add the new symbol to the base's cache.  */
        entry = Fcons (index, new_symbol);
***************
*** 5981,5988 ****
      }
  
    /* Let the symbol A refer to the character A.  */
!   if (SYMBOLP (base) && XSYMBOL (base)->name->size == 1)
!     XSETINT (base, XSYMBOL (base)->name->data[0]);
  
    if (INTEGERP (base))
      {
--- 5981,5988 ----
      }
  
    /* Let the symbol A refer to the character A.  */
!   if (SYMBOLP (base) && XSTRING (SYMBOL_NAME (base))->size == 1)
!     XSETINT (base, XSTRING (SYMBOL_NAME (base))->data[0]);
  
    if (INTEGERP (base))
      {
***************
*** 6017,6023 ****
  parse_solitary_modifier (symbol)
       Lisp_Object symbol;
  {
!   struct Lisp_String *name = XSYMBOL (symbol)->name;
  
    switch (name->data[0])
      {
--- 6017,6023 ----
  parse_solitary_modifier (symbol)
       Lisp_Object symbol;
  {
!   struct Lisp_String *name = XSTRING (SYMBOL_NAME (symbol));
  
    switch (name->data[0])
      {
***************
*** 9478,9488 ****
          binding = Fkey_description (bindings);
  
          newmessage
!           = (char *) alloca (XSYMBOL (function)->name->size
                               + STRING_BYTES (XSTRING (binding))
                               + 100);
          sprintf (newmessage, "You can run the command `%s' with %s",
!                  XSYMBOL (function)->name->data,
                   XSTRING (binding)->data);
          message2_nolog (newmessage,
                          strlen (newmessage),
--- 9478,9488 ----
          binding = Fkey_description (bindings);
  
          newmessage
!           = (char *) alloca (XSTRING (SYMBOL_NAME (function))->size
                               + STRING_BYTES (XSTRING (binding))
                               + 100);
          sprintf (newmessage, "You can run the command `%s' with %s",
!                  XSTRING (SYMBOL_NAME (function))->data,
                   XSTRING (binding)->data);
          message2_nolog (newmessage,
                          strlen (newmessage),