Mercurial > emacs

comparison src/xfns.c @ 90601:a1a25ac6c88a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 427-436) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 134-136) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-110
author Miles Bader <miles@gnu.org>
date Thu, 14 Sep 2006 09:24:00 +0000
parents 6823a91487f2 049cdc4ea1a1
children b5c13d1564a9
comparison
equal deleted inserted replaced
90600:84dd84b43e1b 90601:a1a25ac6c88a
4121 } 4121 }
4122 4122
4123 x_destroy_all_bitmaps (dpyinfo); 4123 x_destroy_all_bitmaps (dpyinfo);
4124 XSetCloseDownMode (dpyinfo->display, DestroyAll); 4124 XSetCloseDownMode (dpyinfo->display, DestroyAll);
4125 4125
4126 #ifdef USE_GTK
4127 xg_display_close (dpyinfo->display);
4128 #else
4126 #ifdef USE_X_TOOLKIT 4129 #ifdef USE_X_TOOLKIT
4127 XtCloseDisplay (dpyinfo->display); 4130 XtCloseDisplay (dpyinfo->display);
4128 #else 4131 #else
4129 XCloseDisplay (dpyinfo->display); 4132 XCloseDisplay (dpyinfo->display);
4130 #endif 4133 #endif
4134 #endif /* ! USE_GTK */
4131 4135
4132 x_delete_display (dpyinfo); 4136 x_delete_display (dpyinfo);
4133 UNBLOCK_INPUT; 4137 UNBLOCK_INPUT;
4134 4138
4135 return Qnil; 4139 return Qnil;
5408 extern XtAppContext Xt_app_con; 5412 extern XtAppContext Xt_app_con;
5409 XmString dir_xmstring, pattern_xmstring; 5413 XmString dir_xmstring, pattern_xmstring;
5410 int count = SPECPDL_INDEX (); 5414 int count = SPECPDL_INDEX ();
5411 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; 5415 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
5412 5416
5417 check_x ();
5418
5413 GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file); 5419 GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
5414 5420
5415 if (popup_activated ()) 5421 if (popup_activated ())
5416 error ("Trying to use a menu from within a menu-entry"); 5422 error ("Trying to use a menu from within a menu-entry");
5417 5423
5574 Lisp_Object file = Qnil; 5580 Lisp_Object file = Qnil;
5575 Lisp_Object decoded_file; 5581 Lisp_Object decoded_file;
5576 int count = SPECPDL_INDEX (); 5582 int count = SPECPDL_INDEX ();
5577 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; 5583 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
5578 char *cdef_file; 5584 char *cdef_file;
5585
5586 check_x ();
5579 5587
5580 GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file); 5588 GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
5581 5589
5582 if (popup_activated ()) 5590 if (popup_activated ())
5583 error ("Trying to use a menu from within a menu-entry"); 5591 error ("Trying to use a menu from within a menu-entry");