bug#890: Problem using `etc/emacs.bash' with EmacsW32

["find lulu" <tpeplt@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 188 bytes --]

If these are not moot, here are suggested patch files and ChangeLog entries
for `emacs/etc/emacs.bash' and `emacs/lisp/server.el' for the latest
revisions on the CVS branch EMACS_22_BASE.

[-- Attachment #1.2: Type: text/html, Size: 225 bytes --]

[-- Attachment #2: ChangeLog --]
[-- Type: application/octet-stream, Size: 148 bytes --]

2008-09-06  <tpeplt@gmail.com>

	* emacs.bash: Added a test for the server file created by EmacsW32
	to the conditional for invoking `emacsclient'.

[-- Attachment #3: emacs.bash.patch --]
[-- Type: application/octet-stream, Size: 833 bytes --]

*** emacs/etc/emacs.bash-1.5.2.2	Sat Sep  6 21:22:20 2008
--- emacs/etc/emacs.bash.new	Sat Sep  6 21:23:17 2008
***************
*** 46,52 ****
   if [ -n "${windowsys:+set}" ]; then
      # Do not just test if these files are sockets.  On some systems
      # ordinary files or fifos are used instead.  Just see if they exist.
!     if [ -e "${HOME}/.emacs_server" -o -e "/tmp/emacs${UID}/server" ]; then
         emacsclient "$@"
         return $?
      else
--- 46,52 ----
   if [ -n "${windowsys:+set}" ]; then
      # Do not just test if these files are sockets.  On some systems
      # ordinary files or fifos are used instead.  Just see if they exist.
!     if [ -e "${HOME}/.emacs.d/server/server" -o -e "${HOME}/.emacs_server" -o -e "/tmp/emacs${UID}/server" ]; then
         emacsclient "$@"
         return $?
      else

[-- Attachment #4: ChangeLog --]
[-- Type: application/octet-stream, Size: 387 bytes --]

2008-09-06  <tpeplt@gmail.com>

	* server.el (server-start): Moved the code that removes any
	leftover socket or authentication file before (and outside) the
	condition that checks to see whether the server should be left
	shut down.  This ensures that the server's socket or
	authentication file is also removed when Emacs is shut down,
	instead of only prior to restarting the server.

[-- Attachment #5: server.el.patch --]
[-- Type: application/octet-stream, Size: 1504 bytes --]

*** emacs/lisp/server.el-1.127.2.6	Sat Sep  6 22:09:51 2008
--- emacs/lisp/server.el.new	Sat Sep  6 22:19:59 2008
***************
*** 323,335 ****
      (let ((buffer (nth 1 (car server-clients))))
        (server-buffer-done buffer)))
    ;; Now any previous server is properly stopped.
!   (unless leave-dead
!     (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
!            (server-file (expand-file-name server-name server-dir)))
!       ;; Make sure there is a safe directory in which to place the socket.
!       (server-ensure-safe-dir server-dir)
!       ;; Remove any leftover socket or authentication file.
!       (ignore-errors (delete-file server-file))
        (when server-process
          (server-log (message "Restarting server")))
        (letf (((default-file-modes) ?\700))
--- 323,335 ----
      (let ((buffer (nth 1 (car server-clients))))
        (server-buffer-done buffer)))
    ;; Now any previous server is properly stopped.
!   (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
!          (server-file (expand-file-name server-name server-dir)))
!     ;; Make sure there is a safe directory in which to place the socket.
!     (server-ensure-safe-dir server-dir)
!     ;; Remove any leftover socket or authentication file.
!     (ignore-errors (delete-file server-file))
!     (unless leave-dead
        (when server-process
          (server-log (message "Restarting server")))
        (letf (((default-file-modes) ?\700))