[Emacs-commit] emacs/src ChangeLog xterm.h xmenu.c xfns.c

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Jan Djärv <address@hidden>      04/11/16 20:52:33

Modified files:
        src            : ChangeLog xterm.h xmenu.c xfns.c 

Log message:
        * xmenu.c (x_menu_in_use): Removed.
        (x_menu_set_in_use): Also set popup_activated_flag.
        
        * xfns.c (Fx_file_dialog): Call popup_activated instead of
        x_menu_in_use.  Call x_menu_set_in_use in Motif version also.
        
        * xterm.h: (x_menu_in_use): Removed.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/ChangeLog.diff?tr1=1.4026&tr2=1.4027&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/xterm.h.diff?tr1=1.169&tr2=1.170&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/xmenu.c.diff?tr1=1.271&tr2=1.272&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/xfns.c.diff?tr1=1.622&tr2=1.623&r1=text&r2=text