comparison src/emacs.c @ 120:cca96a509cfe r20-1b12

Import from CVS: tag r20-1b12
author cvs
date Mon, 13 Aug 2007 09:25:29 +0200
parents fe104dbd9147
children 1370575f1259
comparison
equal deleted inserted replaced
119:d101af7320b8 120:cca96a509cfe
40 #include <setjmp.h> 40 #include <setjmp.h>
41 #include "syssignal.h" /* Always include before systty.h */ 41 #include "syssignal.h" /* Always include before systty.h */
42 #include "systty.h" 42 #include "systty.h"
43 #include "sysfile.h" 43 #include "sysfile.h"
44 #include "systime.h" 44 #include "systime.h"
45
46 /* Hack to get version number in stack backtraces */
47 #include "xemacs-version.h"
45 48
46 #if defined (HAVE_LOCALE_H) && \ 49 #if defined (HAVE_LOCALE_H) && \
47 (defined (I18N2) || defined (I18N3) || defined (I18N4)) 50 (defined (I18N2) || defined (I18N3) || defined (I18N4))
48 #include <locale.h> 51 #include <locale.h>
49 #endif 52 #endif
688 if the display was specified on the command line. */ 691 if the display was specified on the command line. */
689 if ((dpy = getenv ("DISPLAY")) && dpy[0]) 692 if ((dpy = getenv ("DISPLAY")) && dpy[0])
690 display_use = "x"; 693 display_use = "x";
691 694
692 #endif /* HAVE_X_WINDOWS */ 695 #endif /* HAVE_X_WINDOWS */
693
694 #ifdef HAVE_NEXTSTEP
695 if (argmatch (argv, argc, "-NXHost", 0, 6, 0, &skip_args) ||
696 argmatch (argv, argc, "-MachLaunch", 0, 9, 0, &skip_args))
697 {
698 display_arg = 1;
699 display_use = "ns";
700 }
701 #endif /* HAVE_NEXTSTEP */
702 } 696 }
703 #endif /* HAVE_WINDOW_SYSTEM */ 697 #endif /* HAVE_WINDOW_SYSTEM */
704 698
705 noninteractive1 = noninteractive; 699 noninteractive1 = noninteractive;
706 700
872 #endif 866 #endif
873 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) 867 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
874 syms_of_gui_x (); 868 syms_of_gui_x ();
875 #endif 869 #endif
876 #endif /* HAVE_X_WINDOWS */ 870 #endif /* HAVE_X_WINDOWS */
877
878 #ifdef HAVE_NEXTSTEP
879 syms_of_device_ns ();
880 syms_of_frame_ns ();
881 syms_of_glyphs_ns ();
882 syms_of_objects_ns ();
883 #ifdef HAVE_MENUBARS
884 syms_of_menubar_ns ();
885 #endif
886 syms_of_nsselect ();
887 #ifdef HAVE_SCROLLBARS
888 syms_of_scrollbar_ns ();
889 #endif
890 #endif /* HAVE_NEXTSTEP */
891 871
892 #ifdef MULE 872 #ifdef MULE
893 syms_of_mule (); 873 syms_of_mule ();
894 syms_of_mule_ccl (); 874 syms_of_mule_ccl ();
895 syms_of_mule_charset (); 875 syms_of_mule_charset ();