Merge latest fix to xg_event_is_for_menubar.

[gnu-emacs] / src / cmds.c

diff --git a/src/cmds.c b/src/cmds.c
index 465fce18a4bfcfb4df482d347b1e90cf2d2ed97a..81f975a98852ded8932ecc5d2649e6db93061e04 100644 (file)
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -48,8 +48,7 @@ extern Lisp_Object Vtranslation_table_for_input;
 \f
 DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0,
        doc: /* Return buffer position N characters after (before if N negative) point.  */)
-     (n)
-     Lisp_Object n;
+  (Lisp_Object n)
 {
   CHECK_NUMBER (n);
 
@@ -63,8 +62,7 @@ On reaching end or beginning of buffer, stop and signal error.
 Depending on the bidirectional context, the movement may be to the
 right or to the left on the screen.  This is in contrast with
 \\[right-char], which see.  */)
-     (n)
-     Lisp_Object n;
+  (Lisp_Object n)
 {
   if (NILP (n))
     XSETFASTINT (n, 1);
@@ -103,8 +101,7 @@ On attempt to pass beginning or end of buffer, stop and signal error.
 Depending on the bidirectional context, the movement may be to the
 right or to the left on the screen.  This is in contrast with
 \\[left-char], which see.  */)
-     (n)
-     Lisp_Object n;
+  (Lisp_Object n)
 {
   if (NILP (n))
     XSETFASTINT (n, 1);
@@ -123,8 +120,7 @@ Returns the count of lines left to move.  If moving forward,
 that is N - number of lines moved; if backward, N + number moved.
 With positive N, a non-empty line at the end counts as one line
 successfully moved (for the return value).  */)
-     (n)
-     Lisp_Object n;
+  (Lisp_Object n)
 {
   int opoint = PT, opoint_byte = PT_BYTE;
   int pos, pos_byte;
@@ -173,8 +169,7 @@ does not move.  To ignore field boundaries bind
 `inhibit-field-text-motion' to t, or use the `forward-line' function
 instead.  For instance, `(forward-line 0)' does the same thing as
 `(beginning-of-line)', except that it ignores field boundaries.  */)
-     (n)
-     Lisp_Object n;
+  (Lisp_Object n)
 {
   if (NILP (n))
     XSETFASTINT (n, 1);
@@ -197,8 +192,7 @@ point to a different line than the original, unconstrained result.  If
 N is nil or 1, and a rear-sticky field ends at point, the point does
 not move.  To ignore field boundaries bind `inhibit-field-text-motion'
 to t.  */)
-     (n)
-     Lisp_Object n;
+  (Lisp_Object n)
 {
   int newpos;
 
@@ -243,8 +237,7 @@ Interactively, N is the prefix arg, and KILLFLAG is set if
 N was explicitly specified.
 
 The command `delete-forward' is preferable for interactive use.  */)
-     (n, killflag)
-     Lisp_Object n, killflag;
+  (Lisp_Object n, Lisp_Object killflag)
 {
   int pos;
 
@@ -286,8 +279,7 @@ Before insertion, `expand-abbrev' is executed if the inserted character does
 not have word syntax and the previous character in the buffer does.
 After insertion, the value of `auto-fill-function' is called if the
 `auto-fill-chars' table has a non-nil value for the inserted character.  */)
-     (n)
-     Lisp_Object n;
+  (Lisp_Object n)
 {
   int remove_boundary = 1;
   CHECK_NUMBER (n);
@@ -356,9 +348,7 @@ After insertion, the value of `auto-fill-function' is called if the
 static Lisp_Object Qexpand_abbrev;
 
 int
-internal_self_insert (c, noautofill)
-     int c;
-     int noautofill;
+internal_self_insert (int c, int noautofill)
 {
   int hairy = 0;
   Lisp_Object tem;
@@ -546,7 +536,7 @@ internal_self_insert (c, noautofill)
 /* module initialization */
 
 void
-syms_of_cmds ()
+syms_of_cmds (void)
 {
   Qkill_backward_chars = intern_c_string ("kill-backward-chars");
   staticpro (&Qkill_backward_chars);
@@ -587,7 +577,7 @@ More precisely, a char with closeparen syntax is self-inserted.  */);
 }
 
 void
-keys_of_cmds ()
+keys_of_cmds (void)
 {
   int n;