Merge from emacs--rel--22

[gnu-emacs] / src / xsmfns.c

diff --git a/src/xsmfns.c b/src/xsmfns.c
index 008b50fc489d9b73949ef99a73cb229738cd1b53..77abf3b507263fe0e753359021ae620781fc0e15 100644 (file)
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -1,12 +1,12 @@
 /* Session management module for systems which understand the X Session
    management protocol.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -570,7 +570,7 @@ See also `x-session-previous-id', `emacs-save-session-functions',
   DEFVAR_LISP ("x-session-previous-id", &Vx_session_previous_id,
     doc: /* The previous session id Emacs got from session manager.
 If Emacs is running on a window system that has a session manager, the
-session manager gives Emacs a session id.  It is feasible for Emacs lisp
+session manager gives Emacs a session id.  It is feasible for Emacs Lisp
 code to use the session id to save configuration in, for example, a file
 with a file name based on the session id.  If Emacs is running when the
 window system is shut down, the session manager remembers that Emacs was