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

[Miles Bader]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.681.2.11 emacs/src/keyboard.c:1.681.2.12
*** emacs/src/keyboard.c:1.681.2.11     Tue Jul  6 10:00:17 2004
--- emacs/src/keyboard.c        Tue Jul  6 10:10:53 2004
***************
*** 1348,1353 ****
--- 1348,1354 ----
       Lisp_Object arg;
  {
    cancel_hourglass ();
+   return Qnil;
  }
  #endif
  
***************
*** 6256,6267 ****
        {
          int len = SBYTES (name_alist_or_stem);
          char *buf = (char *) alloca (len + 50);
!         if (sizeof (int) == sizeof (EMACS_INT))
!           sprintf (buf, "%s-%d", SDATA (name_alist_or_stem),
!                    XINT (symbol_int) + 1);
!         else if (sizeof (long) == sizeof (EMACS_INT))
!           sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem),
!                    XINT (symbol_int) + 1);
          value = intern (buf);
        }
        else if (name_table != 0 && name_table[symbol_num])
--- 6257,6264 ----
        {
          int len = SBYTES (name_alist_or_stem);
          char *buf = (char *) alloca (len + 50);
!         sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem),
!                  (long) XINT (symbol_int) + 1);
          value = intern (buf);
        }
        else if (name_table != 0 && name_table[symbol_num])
***************
*** 9714,9736 ****
    else if (CONSP (prefixarg) && XINT (XCAR (prefixarg)) == 4)
      strcpy (buf, "C-u ");
    else if (CONSP (prefixarg) && INTEGERP (XCAR (prefixarg)))
!     {
!       if (sizeof (int) == sizeof (EMACS_INT))
!       sprintf (buf, "%d ", XINT (XCAR (prefixarg)));
!       else if (sizeof (long) == sizeof (EMACS_INT))
!       sprintf (buf, "%ld ", (long) XINT (XCAR (prefixarg)));
!       else
!       abort ();
!     }
    else if (INTEGERP (prefixarg))
!     {
!       if (sizeof (int) == sizeof (EMACS_INT))
!       sprintf (buf, "%d ", XINT (prefixarg));
!       else if (sizeof (long) == sizeof (EMACS_INT))
!       sprintf (buf, "%ld ", (long) XINT (prefixarg));
!       else
!       abort ();
!     }
  
    /* This isn't strictly correct if execute-extended-command
       is bound to anything else.  Perhaps it should use
--- 9711,9719 ----
    else if (CONSP (prefixarg) && XINT (XCAR (prefixarg)) == 4)
      strcpy (buf, "C-u ");
    else if (CONSP (prefixarg) && INTEGERP (XCAR (prefixarg)))
!     sprintf (buf, "%ld ", (long) XINT (XCAR (prefixarg)));
    else if (INTEGERP (prefixarg))
!     sprintf (buf, "%ld ", (long) XINT (prefixarg));
  
    /* This isn't strictly correct if execute-extended-command
       is bound to anything else.  Perhaps it should use