changeset 111454:6ed4594cb91b

* src/emacs.c (syms_of_emacs) <system-type>: Doc fix.
author Glenn Morris <rgm@gnu.org>
date Tue, 09 Nov 2010 19:45:29 -0800
parents 5f5f21c6fca1
children f21190964294
files src/ChangeLog src/emacs.c
diffstat 2 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Nov 09 19:43:44 2010 -0800
+++ b/src/ChangeLog	Tue Nov 09 19:45:29 2010 -0800
@@ -1,7 +1,10 @@
+2010-11-10  Glenn Morris  <rgm@gnu.org>
+
+	* emacs.c (syms_of_emacs) <system-type>: Doc fix.
+
 2010-11-09  Eli Zaretskii  <eliz@gnu.org>
 
-	* xfns.c (x_real_positions): Fix declaration-after-statement
-	problem.
+	* xfns.c (x_real_positions): Fix declaration-after-statement problem.
 
 2010-11-09  Chong Yidong  <cyd@stupidchicken.com>
 
--- a/src/emacs.c	Tue Nov 09 19:43:44 2010 -0800
+++ b/src/emacs.c	Tue Nov 09 19:45:29 2010 -0800
@@ -1,7 +1,8 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
-   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999,
-                 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-                 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999,
+  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2411,9 +2412,10 @@
   `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.  */);
+Anything else (in Emacs 24.1, the possibilities are: aix, berkeley-unix,
+hpux, irix, usg-unix-v) indicates some sort of Unix system.  */);
   Vsystem_type = intern_c_string (SYSTEM_TYPE);
+  /* Above values are from SYSTEM_TYPE in src/s/*.h.  */
 
   DEFVAR_LISP ("system-configuration", &Vsystem_configuration,
 	       doc: /* Value is string indicating configuration Emacs was built for.
@@ -2531,5 +2533,3 @@
   daemon_pipe[1] = 0;
 }
 
-/* arch-tag: 7bfd356a-c720-4612-8ab6-aa4222931c2e
-   (do not change this comment) */