Mercurial > hg > xemacs-beta

comparison src/device-x.c @ 4794:8484c6c76837

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 31 Dec 2009 15:47:03 +0000
parents bc4f2511bbea
children b3ea9c582280 e0db3c197671
comparison
equal deleted inserted replaced
4793:8b50bee3c88c 4794:8484c6c76837
58 #include <X11/Xmu/Error.h> 58 #include <X11/Xmu/Error.h>
59 59
60 #if defined(HAVE_SHLIB) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D) 60 #if defined(HAVE_SHLIB) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D)
61 #include "sysdll.h" 61 #include "sysdll.h"
62 #endif /* HAVE_SHLIB and LWLIB_USES_ATHENA and not HAVE_ATHENA_3D */ 62 #endif /* HAVE_SHLIB and LWLIB_USES_ATHENA and not HAVE_ATHENA_3D */
63
64 #ifdef HAVE_OFFIX_DND
65 #include "offix.h"
66 #endif
67 63
68 Lisp_Object Vx_app_defaults_directory; 64 Lisp_Object Vx_app_defaults_directory;
69 #ifdef MULE 65 #ifdef MULE
70 Lisp_Object Qget_coding_system_from_locale; 66 Lisp_Object Qget_coding_system_from_locale;
71 #endif 67 #endif
907 XSetCommand (XtDisplay (app_shell), XtWindow (app_shell), 903 XSetCommand (XtDisplay (app_shell), XtWindow (app_shell),
908 (char **) new_argv, new_argc); 904 (char **) new_argv, new_argc);
909 free_argc_argv (new_argv); 905 free_argc_argv (new_argv);
910 } 906 }
911 #endif /* HAVE_WMCOMMAND */ 907 #endif /* HAVE_WMCOMMAND */
912
913
914 #ifdef HAVE_OFFIX_DND
915 DndInitialize (app_shell);
916 #endif
917 908
918 Vx_initial_argv_list = make_arg_list (argc, argv); 909 Vx_initial_argv_list = make_arg_list (argc, argv);
919 free_argc_argv (argv); 910 free_argc_argv (argv);
920 911
921 DEVICE_X_WM_COMMAND_FRAME (d) = Qnil; 912 DEVICE_X_WM_COMMAND_FRAME (d) = Qnil;