diff options
| author | Miles Bader <miles@gnu.org> | 2005-01-22 21:39:38 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-01-22 21:39:38 +0000 |
| commit | 18643d1d412928c57690271c8b7a65e50503441f (patch) | |
| tree | a9303ce501314fc316c20ca29928b2fa168d0421 /src/emacs.c | |
| parent | cfa4901a57cc9920eec0401d8b33abac7d3f8e5b (diff) | |
| parent | ddff82cf89b20912729a1483da3f28608b44115a (diff) | |
| download | emacs-18643d1d412928c57690271c8b7a65e50503441f.tar.gz emacs-18643d1d412928c57690271c8b7a65e50503441f.tar.bz2 emacs-18643d1d412928c57690271c8b7a65e50503441f.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-4
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-41
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-46
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-47
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-4
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-5
Update from CVS: exi/gnus-faq.texi ([4.1]): Typo.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-6
Update from CVS
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c index 2deb6606fec..becab72ccdd 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1,6 +1,6 @@ /* Fully extensible Emacs, running on Unix, intended for GNU. - Copyright (C) 1985,86,87,93,94,95,97,98,1999,2001,02,03,2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2438,7 +2438,16 @@ syms_of_emacs () Many arguments are deleted from the list as they are processed. */); DEFVAR_LISP ("system-type", &Vsystem_type, - doc: /* Value is symbol indicating type of operating system you are using. */); ++ doc: /* Value is symbol indicating type of operating system you are using. ++Special values: ++ `gnu/linux' compiled for a GNU/Linux system. ++ `darwin' compiled for Darwin (GNU-Darwin, Mac OS X, ...). ++ `macos' compiled for Mac OS 9. ++ `ms-dos' compiled as an MS-DOS application. ++ `windows-nt' compiled as a native W32 application. ++ `cygwin' compiled using the Cygwin library. ++ `vax-vms' or `axp-vms': compiled for a (Open)VMS system. ++Anything else indicates some sort of Unix system. */); Vsystem_type = intern (SYSTEM_TYPE); DEFVAR_LISP ("system-configuration", &Vsystem_configuration, |