bug#19597: Bootstrap Failure

bug#19597: Bootstrap Failure

[Vin Shelton]

FYI -

Using LUCID toolkit fails currently (at least on linux):

/opt/src/emacs-2015-01-14/src/xmenu.c:644:1: note: each undeclared
identifier is reported only once for each function it appears in
/opt/src/emacs-2015-01-14/src/xmenu.c:644:2: error: expected ‘;’
before ‘)’ token
 s);
  ^
/opt/src/emacs-2015-01-14/src/xmenu.c:644:2: error: expected statement
before ‘)’ token
make[2]: *** [xmenu.o] Error 1
make[2]: Leaving directory `/raid-3tb/opt/build/emacs-2015-01-14/src'
make[1]: *** [src] Error 2
make[1]: Leaving directory `/raid-3tb/opt/build/emacs-2015-01-14'
make: *** [bootstrap] Error 2

This patch fixes it, but a larger audit of the preceding changes is
probably required:

--- /home/acs/scmroot/emacs/src/xmenu.c 2015-01-14 06:23:01.282197686 -0500
+++ /opt/src/emacs-2015-01-14/src/xmenu.c 2015-01-14 09:10:03.490385839 -0500
@@ -641,7 +641,6 @@
   /* For reasons I don't know Lucid wants to add one pixel to the frame
      height when adding the menu bar.  Compensate that here.  */
   new_height = FRAME_TEXT_HEIGHT (f) - 1;
-s);
 #endif /* USE_LUCID */
   adjust_frame_size (f, -1, new_height, 2, false, Qmenu_bar_lines);
   unblock_input ();

Regards,
  Vin Shelton

bug#19597: Bootstrap Failure

[martin rudalics]

> Using LUCID toolkit fails currently (at least on linux):
>
> /opt/src/emacs-2015-01-14/src/xmenu.c:644:1: note: each undeclared
> identifier is reported only once for each function it appears in
> /opt/src/emacs-2015-01-14/src/xmenu.c:644:2: error: expected ‘;’
> before ‘)’ token
>   s);
>    ^
> /opt/src/emacs-2015-01-14/src/xmenu.c:644:2: error: expected statement
> before ‘)’ token
> make[2]: *** [xmenu.o] Error 1
> make[2]: Leaving directory `/raid-3tb/opt/build/emacs-2015-01-14/src'
> make[1]: *** [src] Error 2
> make[1]: Leaving directory `/raid-3tb/opt/build/emacs-2015-01-14'
> make: *** [bootstrap] Error 2
>
> This patch fixes it, but a larger audit of the preceding changes is
> probably required:
>
> --- /home/acs/scmroot/emacs/src/xmenu.c 2015-01-14 06:23:01.282197686 -0500
> +++ /opt/src/emacs-2015-01-14/src/xmenu.c 2015-01-14 09:10:03.490385839 -0500
> @@ -641,7 +641,6 @@
>     /* For reasons I don't know Lucid wants to add one pixel to the frame
>        height when adding the menu bar.  Compensate that here.  */
>     new_height = FRAME_TEXT_HEIGHT (f) - 1;
> -s);
>   #endif /* USE_LUCID */
>     adjust_frame_size (f, -1, new_height, 2, false, Qmenu_bar_lines);
>     unblock_input ();

Should have been fixed three hours ago. Please try again.

martin