Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 4982:3c3c1d139863

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 11:25:00 -0600
parents 4aebb0131297 2bf7c51d7101
children 44d7bde26046
comparison
equal deleted inserted replaced
4981:4aebb0131297 4982:3c3c1d139863
712 Lisp_Object fullpath; 712 Lisp_Object fullpath;
713 713
714 full_exe_path = mswindows_get_module_file_name (); 714 full_exe_path = mswindows_get_module_file_name ();
715 assert (full_exe_path); 715 assert (full_exe_path);
716 fullpath = build_tstr_string (full_exe_path); 716 fullpath = build_tstr_string (full_exe_path);
717 xfree (full_exe_path, Extbyte *); 717 xfree (full_exe_path);
718 result = Fcons (fullpath, result); 718 result = Fcons (fullpath, result);
719 } 719 }
720 else 720 else
721 #endif 721 #endif
722 result = Fcons (build_wext_string (argv[i], 722 result = Fcons (build_wext_string (argv[i],
759 { 759 {
760 int elt = 0; 760 int elt = 0;
761 761
762 while (argv[elt]) 762 while (argv[elt])
763 { 763 {
764 xfree (argv[elt], Wexttext *); 764 xfree (argv[elt]);
765 elt++; 765 elt++;
766 } 766 }
767 xfree (argv, Wexttext **); 767 xfree (argv);
768 } 768 }
769 769
770 static void 770 static void
771 init_cmdargs (int argc, Wexttext **argv, int skip_args) 771 init_cmdargs (int argc, Wexttext **argv, int skip_args)
772 { 772 {
935 #endif 935 #endif
936 936
937 #define SHEBANG_PROGNAME_LENGTH \ 937 #define SHEBANG_PROGNAME_LENGTH \
938 (int)((sizeof (WEXTSTRING (SHEBANG_PROGNAME)) - sizeof (WEXTSTRING ("")))) 938 (int)((sizeof (WEXTSTRING (SHEBANG_PROGNAME)) - sizeof (WEXTSTRING (""))))
939 #define SHEBANG_EXE_PROGNAME_LENGTH \ 939 #define SHEBANG_EXE_PROGNAME_LENGTH \
940 (int)(sizeof (WEXTSTRING (SHEBANG_PROGNAME ".exe")) \ 940 (int)(sizeof (WEXTSTRING (SHEBANG_PROGNAME) WEXTSTRING (".exe")) \
941 - sizeof (WEXTSTRING (""))) 941 - sizeof (WEXTSTRING ("")))
942 942
943 { 943 {
944 int progname_len = wext_strlen (argv[0]); 944 int progname_len = wext_strlen (argv[0]);
945 if (progname_len >= SHEBANG_PROGNAME_LENGTH) 945 if (progname_len >= SHEBANG_PROGNAME_LENGTH)
2918 for (i = 0; i < options[best]; i++) 2918 for (i = 0; i < options[best]; i++)
2919 argv[best + i + 1] = 0; 2919 argv[best + i + 1] = 0;
2920 } 2920 }
2921 2921
2922 memcpy (argv, new_argv, sizeof (Wexttext *) * argc); 2922 memcpy (argv, new_argv, sizeof (Wexttext *) * argc);
2923 xfree (new_argv, Wexttext **); 2923 xfree (new_argv);
2924 xfree (options, int *); 2924 xfree (options);
2925 xfree (priority, int *); 2925 xfree (priority);
2926 } 2926 }
2927 2927
2928 DEFUN ("running-temacs-p", Frunning_temacs_p, 0, 0, 0, /* 2928 DEFUN ("running-temacs-p", Frunning_temacs_p, 0, 0, 0, /*
2929 True if running temacs. This means we are in the dumping stage. 2929 True if running temacs. This means we are in the dumping stage.
2930 This is false during normal execution of the `xemacs' program, and 2930 This is false during normal execution of the `xemacs' program, and