From: Andreas Schwab <schwab@suse.de>
Date: Sun, 13 Jun 2004 15:35:03 +0000 (+0000)
Subject: (cancel_hourglass_unwind): Return a value.
X-Git-Tag: ttn-vms-21-2-B4~5796
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cea5d0d4234e3f208023e29873fdb199e0414749;p=emacs.git

(cancel_hourglass_unwind): Return a value.
(modify_event_symbol): Always use %ld for printing EMACS_INT.
(Fexecute_extended_command): Likewise.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c515a13d605..37719505adf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,23 @@
 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>.
 
 	* xfaces.c (face_attr_equal_p): Declare parameters.
diff --git a/src/keyboard.c b/src/keyboard.c
index 042c3108ca8..86642a99552 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1348,6 +1348,7 @@ cancel_hourglass_unwind (arg)
      Lisp_Object arg;
 {
   cancel_hourglass ();
+  return Qnil;
 }
 #endif
 
@@ -6256,12 +6257,8 @@ modify_event_symbol (symbol_num, modifiers, symbol_kind, name_alist_or_stem,
 	{
 	  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);
+	  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,23 +9711,9 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
   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 ();
-    }
+    sprintf (buf, "%ld ", (long) XINT (XCAR (prefixarg)));
   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 ();
-    }
+    sprintf (buf, "%ld ", (long) XINT (prefixarg));
 
   /* This isn't strictly correct if execute-extended-command
      is bound to anything else.  Perhaps it should use