Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-22
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-23
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-24
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-25
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-26
   Fix permission bogosities

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-27
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-28
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-29
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-30
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-50

diff --cc lib-src/emacsclient.c
index d737b2a,9f8eb04..356784a
--- 1/lib-src/emacsclient.c
--- 2/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@@ -432,8 -358,8 +432,8 @@@ main (argc, argv
  
    {
      int sock_status = 0;
-     int oerrno = 0;
 -    int saved_errno;
 -
++    int saved_errno = 0;
 +    
      if (! socket_name)
        {
        socket_name = alloca (system_name_length + 100);
@@@ -473,7 -396,7 +473,7 @@@
                sprintf (server.sun_path, "/tmp/emacs%d-%s/server",
                         (int) pw->pw_uid, system_name);
                sock_status = socket_status (server.sun_path);
-                 oerrno = errno;
 -              saved_errno = errno;
++                saved_errno = errno;
              }
          }
        }
@@@ -492,15 -415,15 +492,15 @@@
  
         case 2:
         /* `stat' failed */
-        if (errno == ENOENT)
+        if (saved_errno == ENOENT)
           fprintf (stderr,
 -                  "%s: can't find socket; have you started the server?\n\
 +                  "%s: Can't find socket; have you started the server?\n\
  To start the server in Emacs, type \"M-x server-start\".\n",
                    argv[0]);
         else
 -         fprintf (stderr, "%s: can't stat %s: %s\n",
 +         fprintf (stderr, "%s: Can't stat %s: %s\n",
-                   argv[0], server.sun_path, strerror (oerrno));
+                   argv[0], server.sun_path, strerror (saved_errno));
 -       fail (argc, argv);
 +       fail ();
         break;
         }
    }

diff --cc lisp/bindings.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/fontset.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keyboard.h
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xmenu.c
Simple merge