(remove-overlays): Fix last change.

[gnu-emacs] / src / xsmfns.c

diff --git a/src/xsmfns.c b/src/xsmfns.c
index 4b99d7be61a287e62ad075f064c8f09e7f1ddc3b..4c250fecf006d5872330278d01c8be0163c7afd6 100644 (file)
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -1,6 +1,6 @@
 /* Session management module for systems which understand the X Session
    management protocol.
 /* 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 Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 
 This file is part of GNU Emacs.
 


@@ -45,15 +45,13 @@ Boston, MA 02110-1301, USA.  */
 #include <sys/param.h>
 #include <stdio.h>
 
 #include <sys/param.h>
 #include <stdio.h>
 

+#include "lisp.h"

 #include "systime.h"
 #include "sysselect.h"
 #include "systime.h"
 #include "sysselect.h"

-#include "lisp.h"

 #include "termhooks.h"
 #include "termopts.h"
 #include "xterm.h"
 
 #include "termhooks.h"
 #include "termopts.h"
 #include "xterm.h"
 

-extern char * get_current_dir_name ();
-

 /* The user login name.  */
 
 extern Lisp_Object Vuser_login_name;
 /* The user login name.  */
 
 extern Lisp_Object Vuser_login_name;


@@ -563,7 +561,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
   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
 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