aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9c55d091f78..ddc8b4c356e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-07-16 Glenn Morris <rgm@gnu.org>
2
3 * emacs.c (system-type): Doc fix.
4
12008-07-15 Stefan Monnier <monnier@iro.umontreal.ca> 52008-07-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * keyboard.c (parse_menu_item): Don't use cachelist, even under NS. 7 * keyboard.c (parse_menu_item): Don't use cachelist, even under NS.
diff --git a/src/emacs.c b/src/emacs.c
index a6e59f8c9fe..869bdef24c4 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2508,14 +2508,13 @@ Many arguments are deleted from the list as they are processed. */);
2508 DEFVAR_LISP ("system-type", &Vsystem_type, 2508 DEFVAR_LISP ("system-type", &Vsystem_type,
2509 doc: /* Value is symbol indicating type of operating system you are using. 2509 doc: /* Value is symbol indicating type of operating system you are using.
2510Special values: 2510Special values:
2511 `gnu' compiled for a GNU Hurd system.
2511 `gnu/linux' compiled for a GNU/Linux system. 2512 `gnu/linux' compiled for a GNU/Linux system.
2512 `darwin' compiled for Darwin (GNU-Darwin, Mac OS X, ...). 2513 `darwin' compiled for Darwin (GNU-Darwin, Mac OS X, ...).
2513 `macos' compiled for Mac OS 9.
2514 `ms-dos' compiled as an MS-DOS application. 2514 `ms-dos' compiled as an MS-DOS application.
2515 `windows-nt' compiled as a native W32 application. 2515 `windows-nt' compiled as a native W32 application.
2516 `cygwin' compiled using the Cygwin library. 2516 `cygwin' compiled using the Cygwin library.
2517 `vax-vms' or 2517 `vax-vms' compiled for a (Open)VMS system.
2518 `axp-vms' compiled for a (Open)VMS system.
2519Anything else indicates some sort of Unix system. */); 2518Anything else indicates some sort of Unix system. */);
2520 Vsystem_type = intern (SYSTEM_TYPE); 2519 Vsystem_type = intern (SYSTEM_TYPE);
2521 2520