comparison src/emacs.c @ 83632:cc587bfd19ca

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 781-792) - Update from CVS - Merge from gnus--rel--5.10 - Merge from emacs--rel--22 * emacs--rel--22 (patch 33-41) * gnus--rel--5.10 (patch 226-228) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
author Miles Bader <miles@gnu.org>
date Mon, 11 Jun 2007 01:00:07 +0000
parents 85ebbe91c285 0aafd69cb508
children 65663fcd2caa
comparison
equal deleted inserted replaced
83631:7d63b897231b 83632:cc587bfd19ca
132 Lisp_Object Vinstallation_directory; 132 Lisp_Object Vinstallation_directory;
133 133
134 /* Hook run by `kill-emacs' before it does really anything. */ 134 /* Hook run by `kill-emacs' before it does really anything. */
135 Lisp_Object Vkill_emacs_hook; 135 Lisp_Object Vkill_emacs_hook;
136 136
137 /* An empty lisp string. To avoid having to build any other. */ 137 /* Empty lisp strings. To avoid having to build any others. */
138 Lisp_Object empty_string; 138 Lisp_Object empty_unibyte_string, empty_multibyte_string;
139 139
140 /* Search path separator. */ 140 /* Search path separator. */
141 Lisp_Object Vpath_separator; 141 Lisp_Object Vpath_separator;
142 142
143 /* Set nonzero after Emacs has started up the first time. 143 /* Set nonzero after Emacs has started up the first time.
855 if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args) 855 if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args)
856 /* We don't know the version number unless this is a dumped Emacs. 856 /* We don't know the version number unless this is a dumped Emacs.
857 So ignore --version otherwise. */ 857 So ignore --version otherwise. */
858 && initialized) 858 && initialized)
859 { 859 {
860 Lisp_Object tem; 860 Lisp_Object tem, tem2;
861 tem = Fsymbol_value (intern ("emacs-version")); 861 tem = Fsymbol_value (intern ("emacs-version"));
862 tem2 = Fsymbol_value (intern ("emacs-copyright"));
862 if (!STRINGP (tem)) 863 if (!STRINGP (tem))
863 { 864 {
864 fprintf (stderr, "Invalid value of `emacs-version'\n"); 865 fprintf (stderr, "Invalid value of `emacs-version'\n");
865 exit (1); 866 exit (1);
866 } 867 }
868 if (!STRINGP (tem2))
869 {
870 fprintf (stderr, "Invalid value of `emacs-copyright'\n");
871 exit (1);
872 }
867 else 873 else
868 { 874 {
869 printf ("GNU Emacs %s\n", SDATA (tem)); 875 printf ("GNU Emacs %s\n", SDATA (tem));
870 printf ("Copyright (C) 2007 Free Software Foundation, Inc.\n"); 876 printf ("%s\n", SDATA(tem2));
871 printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n"); 877 printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
872 printf ("You may redistribute copies of Emacs\n"); 878 printf ("You may redistribute copies of Emacs\n");
873 printf ("under the terms of the GNU General Public License.\n"); 879 printf ("under the terms of the GNU General Public License.\n");
874 printf ("For more information about these matters, "); 880 printf ("For more information about these matters, ");
875 printf ("see the file named COPYING.\n"); 881 printf ("see the file named COPYING.\n");
2469 see `kill-emacs-query-functions' instead. 2475 see `kill-emacs-query-functions' instead.
2470 2476
2471 The hook is not run in batch mode, i.e., if `noninteractive' is non-nil. */); 2477 The hook is not run in batch mode, i.e., if `noninteractive' is non-nil. */);
2472 Vkill_emacs_hook = Qnil; 2478 Vkill_emacs_hook = Qnil;
2473 2479
2474 empty_string = build_string ("");
2475 staticpro (&empty_string);
2476
2477 DEFVAR_INT ("emacs-priority", &emacs_priority, 2480 DEFVAR_INT ("emacs-priority", &emacs_priority,
2478 doc: /* Priority for Emacs to run at. 2481 doc: /* Priority for Emacs to run at.
2479 This value is effective only if set before Emacs is dumped, 2482 This value is effective only if set before Emacs is dumped,
2480 and only if the Emacs executable is installed with setuid to permit 2483 and only if the Emacs executable is installed with setuid to permit
2481 it to change priority. (Emacs sets its uid back to the real uid.) 2484 it to change priority. (Emacs sets its uid back to the real uid.)