summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c18
2 files changed, 14 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fc92f40e2ef..ce75491e6fc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-20 Glenn Morris <rgm@gnu.org>
+
+ * emacs.c (system-type): Doc fix.
+
2009-08-19 Stefan Monnier <monnier@iro.umontreal.ca>
* keyboard.c (syms_of_keyboard): Default to 5 buttons, which should be
diff --git a/src/emacs.c b/src/emacs.c
index 657465da833..8097d7a382d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2589,15 +2589,17 @@ 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: /* The value is a symbol indicating the type of operating system you are using.
Special values:
- `gnu' compiled for a GNU Hurd system.
- `gnu/linux' compiled for a GNU/Linux system.
- `darwin' compiled for Darwin (GNU-Darwin, Mac OS X, ...).
- `ms-dos' compiled as an MS-DOS application.
- `windows-nt' compiled as a native W32 application.
- `cygwin' compiled using the Cygwin library.
-Anything else indicates some sort of Unix system. */);
+ `gnu' compiled for a GNU Hurd system.
+ `gnu/linux' compiled for a GNU/Linux system.
+ `gnu/kfreebsd' compiled for a GNU system with a FreeBSD kernel.
+ `darwin' compiled for Darwin (GNU-Darwin, Mac OS X, ...).
+ `ms-dos' compiled as an MS-DOS application.
+ `windows-nt' compiled as a native W32 application.
+ `cygwin' compiled using the Cygwin library.
+Anything else (in Emacs 23.1, the possibilities are: aix, berkeley-unix,
+hpux, irix, lynxos 3.0.1, usg-unix-v) indicates some sort of Unix system. */);
Vsystem_type = intern (SYSTEM_TYPE);
DEFVAR_LISP ("system-configuration", &Vsystem_configuration,