From bd6bc2222da75706e4da1936388c49e10ab1c699 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 9 Nov 2010 19:45:29 -0800 Subject: [PATCH] * src/emacs.c (syms_of_emacs) : Doc fix. --- src/ChangeLog | 7 +++++-- src/emacs.c | 14 +++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 985a07c4ea3..e1e66c0c249 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,10 @@ +2010-11-10 Glenn Morris + + * emacs.c (syms_of_emacs) : Doc fix. + 2010-11-09 Eli Zaretskii - * 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 diff --git a/src/emacs.c b/src/emacs.c index a38847e3bd3..64da350e22c 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -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 @@ Special values: `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 @@ libraries; only those already known by Emacs will be loaded. */); daemon_pipe[1] = 0; } -/* arch-tag: 7bfd356a-c720-4612-8ab6-aa4222931c2e - (do not change this comment) */ -- 2.11.4.GIT