[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c |
Date: |
Tue, 16 Nov 2004 16:02:41 -0500 |
Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.622 emacs/src/xfns.c:1.623
*** emacs/src/xfns.c:1.622 Sun Nov 14 09:59:02 2004
--- emacs/src/xfns.c Tue Nov 16 20:52:32 2004
***************
*** 5144,5150 ****
GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
! if (x_menu_in_use ())
error ("Trying to use a menu from within a menu-entry");
CHECK_STRING (prompt);
--- 5144,5150 ----
GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
! if (popup_activated ())
error ("Trying to use a menu from within a menu-entry");
CHECK_STRING (prompt);
***************
*** 5232,5237 ****
--- 5232,5238 ----
record_unwind_protect (clean_up_file_dialog, make_save_value (dialog, 0));
/* Process events until the user presses Cancel or OK. */
+ x_menu_set_in_use (1);
result = 0;
while (result == 0)
{
***************
*** 5297,5303 ****
GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
! if (x_menu_in_use ())
error ("Trying to use a menu from within a menu-entry");
CHECK_STRING (prompt);
--- 5298,5304 ----
GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
! if (popup_activated ())
error ("Trying to use a menu from within a menu-entry");
CHECK_STRING (prompt);