mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-05 20:43:08 +00:00
Code Issues Releases Activity

(cancel_hourglass_unwind): Return a value.

Browse Source 
(modify_event_symbol): Always use %ld for printing EMACS_INT.
(Fexecute_extended_command): Likewise.
This commit is contained in:
Andreas Schwab 2004-06-13 15:35:03 +00:00
parent 474f84d925
commit cea5d0d423
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ChangeLog
View File

@ -1,5 +1,23 @@
2004-06-13 Andreas Schwab <schwab@suse.de> 2004-06-13 Andreas Schwab <schwab@suse.de>
* print.c (print_object): Always use %ld for printing EMACS_INT.
* keyboard.c (cancel_hourglass_unwind): Return a value.
(modify_event_symbol): Always use %ld for printing EMACS_INT.
(Fexecute_extended_command): Likewise.
* syntax.h (SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
avoid clashes.
(SYNTAX): Likewise.
(SYNTAX_WITH_FLAGS): Likewise.
(SYNTAX_MATCH): Likewise.
* syntax.c (char_quoted): Avoid warning about undefined operation.
(find_defun_start): Likewise.
(scan_lists): Likewise.
(INC_FROM): Likewise.
(scan_sexps_forward): Likewise.
* image.c: Include <ctype.h>. * image.c: Include <ctype.h>.
* xfaces.c (face_attr_equal_p): Declare parameters. * xfaces.c (face_attr_equal_p): Declare parameters.

27
src/keyboard.c
View File

@ -1348,6 +1348,7 @@ cancel_hourglass_unwind (arg)
Lisp_Object arg; Lisp_Object arg;
{ {
cancel_hourglass (); cancel_hourglass ();
return Qnil;
} }
#endif #endif
@ -6256,12 +6257,8 @@ modify_event_symbol (symbol_num, modifiers, symbol_kind, name_alist_or_stem,
{ {
int len = SBYTES (name_alist_or_stem); int len = SBYTES (name_alist_or_stem);
char *buf = (char *) alloca (len + 50); char *buf = (char *) alloca (len + 50);
if (sizeof (int) == sizeof (EMACS_INT)) sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem),
sprintf (buf, "%s-%d", SDATA (name_alist_or_stem), (long) XINT (symbol_int) + 1);
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); value = intern (buf);
} }
else if (name_table != 0 && name_table[symbol_num]) else if (name_table != 0 && name_table[symbol_num])
@ -9714,23 +9711,9 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
else if (CONSP (prefixarg) && XINT (XCAR (prefixarg)) == 4) else if (CONSP (prefixarg) && XINT (XCAR (prefixarg)) == 4)
strcpy (buf, "C-u "); strcpy (buf, "C-u ");
else if (CONSP (prefixarg) && INTEGERP (XCAR (prefixarg))) else if (CONSP (prefixarg) && INTEGERP (XCAR (prefixarg)))
{ sprintf (buf, "%ld ", (long) XINT (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)) else if (INTEGERP (prefixarg))
{ sprintf (buf, "%ld ", (long) XINT (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 /* This isn't strictly correct if execute-extended-command
is bound to anything else. Perhaps it should use is bound to anything else. Perhaps it should use