Mercurial > hg > xemacs-beta
diff src/device-x.c @ 4794:8484c6c76837
Merge.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 31 Dec 2009 15:47:03 +0000 |
parents | bc4f2511bbea |
children | b3ea9c582280 e0db3c197671 |
line wrap: on
line diff
--- a/src/device-x.c Sat Dec 19 18:10:20 2009 +0000 +++ b/src/device-x.c Thu Dec 31 15:47:03 2009 +0000 @@ -61,10 +61,6 @@ #include "sysdll.h" #endif /* HAVE_SHLIB and LWLIB_USES_ATHENA and not HAVE_ATHENA_3D */ -#ifdef HAVE_OFFIX_DND -#include "offix.h" -#endif - Lisp_Object Vx_app_defaults_directory; #ifdef MULE Lisp_Object Qget_coding_system_from_locale; @@ -910,11 +906,6 @@ } #endif /* HAVE_WMCOMMAND */ - -#ifdef HAVE_OFFIX_DND - DndInitialize (app_shell); -#endif - Vx_initial_argv_list = make_arg_list (argc, argv); free_argc_argv (argv);