Mercurial > hg > xemacs-beta

comparison src/device-x.c @ 5228:5efbd1253905

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove all support for InfoDock. src/ChangeLog addition: 2010-06-02 Aidan Kehoe <kehoea@parhasard.net> * lread.c (vars_of_lread): * emacs.c: (shut_down_emacs, vars_of_emacs, complex_vars_of_emacs): * device-x.c (get_device_from_display) (have_xemacs_resources_in_xrdb): * device-gtk.c (Fgtk_init): * config.h.in: Remove all checks for InfoDock. lisp/ChangeLog addition: 2010-06-02 Aidan Kehoe <kehoea@parhasard.net> * version.el: (emacs-version): * startup.el (command-line): * simple.el (display-warning, emacs-name): * packages.el (packages-package-hierarchy-directory-names): * loadup.el (Dumping): * dumped-lisp.el (preloaded-file-list): Remove all InfoDock-specific code.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 07 Jun 2010 18:42:10 +0100
parents 912c34f1d7c8
children 6466bc9ebf15
comparison
equal deleted inserted replaced
5227:fbd1485af104 5228:5efbd1253905
147 } 147 }
148 148
149 struct device * 149 struct device *
150 get_device_from_display (Display *dpy) 150 get_device_from_display (Display *dpy)
151 { 151 {
152 #define FALLBACK_RESOURCE_NAME "xemacs"
152 struct device *d = get_device_from_display_1 (dpy); 153 struct device *d = get_device_from_display_1 (dpy);
153
154 #if !defined(INFODOCK)
155 # define FALLBACK_RESOURCE_NAME "xemacs"
156 # else
157 # define FALLBACK_RESOURCE_NAME "infodock"
158 #endif
159 154
160 if (!d) 155 if (!d)
161 { 156 {
162 /* This isn't one of our displays. Let's crash? */ 157 /* This isn't one of our displays. Let's crash? */
163 stderr_out 158 stderr_out
342 have_xemacs_resources_in_xrdb (Display *dpy) 337 have_xemacs_resources_in_xrdb (Display *dpy)
343 { 338 {
344 const char *xdefs, *key; 339 const char *xdefs, *key;
345 int len; 340 int len;
346 341
347 #ifdef INFODOCK
348 key = "InfoDock";
349 #else
350 key = "XEmacs"; 342 key = "XEmacs";
351 #endif
352 len = strlen (key); 343 len = strlen (key);
353 344
354 if (!dpy) 345 if (!dpy)
355 return 0; 346 return 0;
356 347
651 { 642 {
652 if (egetenv ("USE_EMACS_AS_DEFAULT_APPLICATION_CLASS")) 643 if (egetenv ("USE_EMACS_AS_DEFAULT_APPLICATION_CLASS"))
653 { 644 {
654 app_class = (NILP (Vx_emacs_application_class) && 645 app_class = (NILP (Vx_emacs_application_class) &&
655 have_xemacs_resources_in_xrdb (dpy)) 646 have_xemacs_resources_in_xrdb (dpy))
656 #ifdef INFODOCK
657 ? "InfoDock"
658 #else
659 ? "XEmacs" 647 ? "XEmacs"
660 #endif
661 : "Emacs"; 648 : "Emacs";
662 } 649 }
663 else 650 else
664 { 651 {
665 app_class = "XEmacs"; 652 app_class = "XEmacs";