aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-08-20 06:41:43 +0000
committerGlenn Morris2009-08-20 06:41:43 +0000
commitcf59a3740d31c7b94b08646b5c695c0806ec4906 (patch)
treedf5959fa43b5c01b5be3025dbe97e8f4403a1d6f
parent31764e153f533f25e36586e0606395cfe77fac39 (diff)
downloademacs-cf59a3740d31c7b94b08646b5c695c0806ec4906.tar.gz
emacs-cf59a3740d31c7b94b08646b5c695c0806ec4906.zip
(system-type): Doc fix.
-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 @@
12009-08-20 Glenn Morris <rgm@gnu.org>
2
3 * emacs.c (system-type): Doc fix.
4
12009-08-19 Stefan Monnier <monnier@iro.umontreal.ca> 52009-08-19 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * keyboard.c (syms_of_keyboard): Default to 5 buttons, which should be 7 * 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 ()
2589Many arguments are deleted from the list as they are processed. */); 2589Many arguments are deleted from the list as they are processed. */);
2590 2590
2591 DEFVAR_LISP ("system-type", &Vsystem_type, 2591 DEFVAR_LISP ("system-type", &Vsystem_type,
2592 doc: /* Value is symbol indicating type of operating system you are using. 2592 doc: /* The value is a symbol indicating the type of operating system you are using.
2593Special values: 2593Special values:
2594 `gnu' compiled for a GNU Hurd system. 2594 `gnu' compiled for a GNU Hurd system.
2595 `gnu/linux' compiled for a GNU/Linux system. 2595 `gnu/linux' compiled for a GNU/Linux system.
2596 `darwin' compiled for Darwin (GNU-Darwin, Mac OS X, ...). 2596 `gnu/kfreebsd' compiled for a GNU system with a FreeBSD kernel.
2597 `ms-dos' compiled as an MS-DOS application. 2597 `darwin' compiled for Darwin (GNU-Darwin, Mac OS X, ...).
2598 `windows-nt' compiled as a native W32 application. 2598 `ms-dos' compiled as an MS-DOS application.
2599 `cygwin' compiled using the Cygwin library. 2599 `windows-nt' compiled as a native W32 application.
2600Anything else indicates some sort of Unix system. */); 2600 `cygwin' compiled using the Cygwin library.
2601Anything else (in Emacs 23.1, the possibilities are: aix, berkeley-unix,
2602hpux, irix, lynxos 3.0.1, usg-unix-v) indicates some sort of Unix system. */);
2601 Vsystem_type = intern (SYSTEM_TYPE); 2603 Vsystem_type = intern (SYSTEM_TYPE);
2602 2604
2603 DEFVAR_LISP ("system-configuration", &Vsystem_configuration, 2605 DEFVAR_LISP ("system-configuration", &Vsystem_configuration,