diff options
| author | Glenn Morris | 2007-06-07 07:23:36 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-06-07 07:23:36 +0000 |
| commit | 5cf9ca93e59f1b8f8dba4f4049a7915accfbf913 (patch) | |
| tree | bdbfed1047061cbae410b28d36a039645fde4048 /src | |
| parent | 6926c9548aa92c939dce60ad2ffaf5b529cebad4 (diff) | |
| download | emacs-5cf9ca93e59f1b8f8dba4f4049a7915accfbf913.tar.gz emacs-5cf9ca93e59f1b8f8dba4f4049a7915accfbf913.zip | |
(main): Use `emacs-copyright' in --version output.
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c index 62b14a55388..e235856847f 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -856,17 +856,23 @@ main (argc, argv | |||
| 856 | So ignore --version otherwise. */ | 856 | So ignore --version otherwise. */ |
| 857 | && initialized) | 857 | && initialized) |
| 858 | { | 858 | { |
| 859 | Lisp_Object tem; | 859 | Lisp_Object tem, tem2; |
| 860 | tem = Fsymbol_value (intern ("emacs-version")); | 860 | tem = Fsymbol_value (intern ("emacs-version")); |
| 861 | tem2 = Fsymbol_value (intern ("emacs-copyright")); | ||
| 861 | if (!STRINGP (tem)) | 862 | if (!STRINGP (tem)) |
| 862 | { | 863 | { |
| 863 | fprintf (stderr, "Invalid value of `emacs-version'\n"); | 864 | fprintf (stderr, "Invalid value of `emacs-version'\n"); |
| 864 | exit (1); | 865 | exit (1); |
| 865 | } | 866 | } |
| 867 | if (!STRINGP (tem2)) | ||
| 868 | { | ||
| 869 | fprintf (stderr, "Invalid value of `emacs-copyright'\n"); | ||
| 870 | exit (1); | ||
| 871 | } | ||
| 866 | else | 872 | else |
| 867 | { | 873 | { |
| 868 | printf ("GNU Emacs %s\n", SDATA (tem)); | 874 | printf ("GNU Emacs %s\n", SDATA (tem)); |
| 869 | printf ("Copyright (C) 2007 Free Software Foundation, Inc.\n"); | 875 | printf ("%s\n", SDATA(tem2)); |
| 870 | printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n"); | 876 | printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n"); |
| 871 | printf ("You may redistribute copies of Emacs\n"); | 877 | printf ("You may redistribute copies of Emacs\n"); |
| 872 | printf ("under the terms of the GNU General Public License.\n"); | 878 | printf ("under the terms of the GNU General Public License.\n"); |