(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.

[bpt/emacs.git] / src / xsmfns.c

diff --git a/src/xsmfns.c b/src/xsmfns.c
index 974b3a1..bfc8a2d 100644 (file)
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -1,12 +1,13 @@
 /* Session management module for systems which understand the X Session
    management protocol.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+     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,
@@ -388,16 +389,9 @@ ice_conn_watch_CB (iceConn, clientData, opening, watchData)
     }
 
   ice_fd = IceConnectionNumber (iceConn);
-#ifndef F_SETOWN_BUG
 #ifdef F_SETOWN
-#ifdef F_SETOWN_SOCK_NEG
-  /* stdin is a socket here */
-  fcntl (ice_fd, F_SETOWN, -getpid ());
-#else /* ! defined (F_SETOWN_SOCK_NEG) */
   fcntl (ice_fd, F_SETOWN, getpid ());
-#endif /* ! defined (F_SETOWN_SOCK_NEG) */
 #endif /* ! defined (F_SETOWN) */
-#endif /* F_SETOWN_BUG */
 
 #ifdef SIGIO
   if (interrupt_input)
@@ -570,7 +564,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