Missing xmenu.c change?

Missing xmenu.c change?

[YAMAMOTO Mitsuharu]

I think the following entry in src/ChangeLog is not applied to xmenu.c
actually.  Also, similar changes would be needed for macmenu.c and
w32menu.c as well.

2006-09-08  Richard Stallman  <rms@gnu.org>

        * xmenu.c (Vmenu_updating_frame): Don't define here.
        (syms_of_xmenu): Don't DEFVAR it here.

				     YAMAMOTO Mitsuharu
				mituharu@math.s.chiba-u.ac.jp

Re: Missing xmenu.c change?

[Romain Francoise]

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> writes:

> I think the following entry in src/ChangeLog is not applied to xmenu.c
> actually.  Also, similar changes would be needed for macmenu.c and
> w32menu.c as well.

Yes, it causes a build error:

| alpha-linux-gnu-gcc -nostdlib `./prefix-args -Xlinker  -z nocombreloc` -g -o temacs pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o charset.o coding.o category.o ccl.o cm.o term.o xfaces.o xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o  emacs.o keyboard.o macros.o keymap.o sysdep.o buffer.o filelock.o insdel.o marker.o minibuf.o fileio.o dired.o filemode.o cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o alloc.o data.o doc.o editfns.o callint.o eval.o floatfns.o fns.o print.o lread.o abbrev.o syntax.o unexelf.o bytecode.o process.o callproc.o region-cache.o sound.o atimer.o doprnt.o strftime.o intervals.o textprop.o composite.o md5.o    terminfo.o lastfile.o   vm-limit.o  widget.o    ../lwlib/liblw.a  -lXaw3d -lXmu -lXt -lSM -lICE -lXext -ltiff -ljpeg -lpng -lz -lm -lungif -lXpm -lX11 -lasound -lm -ldl -l
 pthread -lncurses   -lm -lgcc -lc -lgcc /usr/lib/crtn.o 
| xmenu.o: In function `menubar_id_to_frame':
| /build/buildd/emacs-snapshot-20060908/src/xmenu.c:247: multiple definition of `Vmenu_updating_frame'
| xdisp.o:/build/buildd/emacs-snapshot-20060908/src/xdisp.c:1145: first defined here
| collect2: ld returned 1 exit status
| make[3]: *** [temacs] Error 1

-- 
Romain Francoise <romain@orebokech.com> | The sea! the sea! the open
it's a miracle -- http://orebokech.com/ | sea! The blue, the fresh, the
                                        | ever free! --Bryan W. Procter

Re: Missing xmenu.c change?

[Richard Stallman]

    I think the following entry in src/ChangeLog is not applied to xmenu.c
    actually.

I see I forgot to check in xmenu.c.  I did so now.

	       Also, similar changes would be needed for macmenu.c and
    w32menu.c as well.

Would other people please change them?