Mercurial > emacs
comparison src/keyboard.c @ 56070:343ad07ce78b
(cancel_hourglass_unwind): Return a value.
(modify_event_symbol): Always use %ld for printing EMACS_INT.
(Fexecute_extended_command): Likewise.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Sun, 13 Jun 2004 15:34:11 +0000 |
parents | 7e63582e48f6 |
children | 53ee24947683 |
comparison
equal
deleted
inserted
replaced
56069:cef7e1f2e773 | 56070:343ad07ce78b |
---|---|
1346 static Lisp_Object | 1346 static Lisp_Object |
1347 cancel_hourglass_unwind (arg) | 1347 cancel_hourglass_unwind (arg) |
1348 Lisp_Object arg; | 1348 Lisp_Object arg; |
1349 { | 1349 { |
1350 cancel_hourglass (); | 1350 cancel_hourglass (); |
1351 return Qnil; | |
1351 } | 1352 } |
1352 #endif | 1353 #endif |
1353 | 1354 |
1354 Lisp_Object | 1355 Lisp_Object |
1355 command_loop_1 () | 1356 command_loop_1 () |
6254 value = Fcdr_safe (Fassq (symbol_int, name_alist_or_stem)); | 6255 value = Fcdr_safe (Fassq (symbol_int, name_alist_or_stem)); |
6255 else if (STRINGP (name_alist_or_stem)) | 6256 else if (STRINGP (name_alist_or_stem)) |
6256 { | 6257 { |
6257 int len = SBYTES (name_alist_or_stem); | 6258 int len = SBYTES (name_alist_or_stem); |
6258 char *buf = (char *) alloca (len + 50); | 6259 char *buf = (char *) alloca (len + 50); |
6259 if (sizeof (int) == sizeof (EMACS_INT)) | 6260 sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem), |
6260 sprintf (buf, "%s-%d", SDATA (name_alist_or_stem), | 6261 (long) XINT (symbol_int) + 1); |
6261 XINT (symbol_int) + 1); | |
6262 else if (sizeof (long) == sizeof (EMACS_INT)) | |
6263 sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem), | |
6264 XINT (symbol_int) + 1); | |
6265 value = intern (buf); | 6262 value = intern (buf); |
6266 } | 6263 } |
6267 else if (name_table != 0 && name_table[symbol_num]) | 6264 else if (name_table != 0 && name_table[symbol_num]) |
6268 value = intern (name_table[symbol_num]); | 6265 value = intern (name_table[symbol_num]); |
6269 | 6266 |
9712 if (EQ (prefixarg, Qminus)) | 9709 if (EQ (prefixarg, Qminus)) |
9713 strcpy (buf, "- "); | 9710 strcpy (buf, "- "); |
9714 else if (CONSP (prefixarg) && XINT (XCAR (prefixarg)) == 4) | 9711 else if (CONSP (prefixarg) && XINT (XCAR (prefixarg)) == 4) |
9715 strcpy (buf, "C-u "); | 9712 strcpy (buf, "C-u "); |
9716 else if (CONSP (prefixarg) && INTEGERP (XCAR (prefixarg))) | 9713 else if (CONSP (prefixarg) && INTEGERP (XCAR (prefixarg))) |
9717 { | 9714 sprintf (buf, "%ld ", (long) XINT (XCAR (prefixarg))); |
9718 if (sizeof (int) == sizeof (EMACS_INT)) | |
9719 sprintf (buf, "%d ", XINT (XCAR (prefixarg))); | |
9720 else if (sizeof (long) == sizeof (EMACS_INT)) | |
9721 sprintf (buf, "%ld ", (long) XINT (XCAR (prefixarg))); | |
9722 else | |
9723 abort (); | |
9724 } | |
9725 else if (INTEGERP (prefixarg)) | 9715 else if (INTEGERP (prefixarg)) |
9726 { | 9716 sprintf (buf, "%ld ", (long) XINT (prefixarg)); |
9727 if (sizeof (int) == sizeof (EMACS_INT)) | |
9728 sprintf (buf, "%d ", XINT (prefixarg)); | |
9729 else if (sizeof (long) == sizeof (EMACS_INT)) | |
9730 sprintf (buf, "%ld ", (long) XINT (prefixarg)); | |
9731 else | |
9732 abort (); | |
9733 } | |
9734 | 9717 |
9735 /* This isn't strictly correct if execute-extended-command | 9718 /* This isn't strictly correct if execute-extended-command |
9736 is bound to anything else. Perhaps it should use | 9719 is bound to anything else. Perhaps it should use |
9737 this_command_keys? */ | 9720 this_command_keys? */ |
9738 strcat (buf, "M-x "); | 9721 strcat (buf, "M-x "); |