Merged in changes from CVS trunk.

Patches applied:

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-6
   Update from CVS

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-7
   Sync with miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-539.

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--version-0
   Branch closed.  Use miles@gnu.org--gnu-2005/emacs--cvs-trunk--0 instead.

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-484
   Merge from gnus--rel--5.10

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-492
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-494
   Update from CVS: lisp/startup.el (command-line): Fix typo.

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-495
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-498
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-501
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-503
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-505
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-507
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-509
   Update from CVS: .cvsignore: Add `lock'.

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-512
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-513
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-515
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-517
   Merge from gnus--rel--5.10

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-530
   Merge from gnus--rel--5.10

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-536
   Merge from gnus--rel--5.10

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-88
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-89
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-90
   Update FSF's address in GPL notices

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-91
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-92
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-93
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-94
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-95
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-96
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-97
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-98
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-99
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-100
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-101
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-102
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-103
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-104
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-105
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-106
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-107
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-108
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-109
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-110
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-111
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-112
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-113
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-114
   Update from CVS


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

6 files changed, 136 insertions, 43 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index deb2b4ce3eb..e3fb1e07ab8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,35 @@
+2005-09-10  Romain Francoise  <romain@orebokech.com>
+
+        * buffer.c (init_buffer): Grow buffer to add directory separator
+        and terminal zero.  Fix typos.
+
+2005-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * buffer.c (init_buffer): Fix error message for failed call to
+        get_current_dir_name.
+        (get_current_dir_name): Remove prototype.
+
+        * xsmfns.c: (get_current_dir_name): Remove prototype.
+
+        * lisp.h: (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]: Add
+        prototype.
+
+        * sysdep.c [WINDOWSNT]: Add prototype for getwd.
+        Don't #undef NULL after including blockinput.h.
+
+        * config.in: Regenerated.
+
+2005-09-10  Giuseppe Scrivano  <gscrivano@gmail.com>
+
+        Remove the MAXPATHLEN limitations:
+
+        * sysdep.c (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]:
+        New function.
+
+        * buffer.c (init_buffer): Use it.
+
+        * xsmfns.c (smc_save_yourself_CB): Ditto.
+
 2005-09-09  Kim F. Storm  <storm@cua.dk>
 
         * doc.c (Fsubstitute_command_keys): Lookup key binding for
diff --git a/src/buffer.c b/src/buffer.c
index 30626f11a24..fb1ff1c22e9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -32,10 +32,6 @@ Boston, MA 02110-1301, USA.  */
 extern int errno;
 #endif
 
-#ifndef MAXPATHLEN
-/* in 4.1 [probably SunOS? -stef] , param.h fails to define this. */
-#define MAXPATHLEN 1024
-#endif /* not MAXPATHLEN */
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -5115,7 +5111,6 @@ init_buffer_once ()
 void
 init_buffer ()
 {
-  char buf[MAXPATHLEN + 1];
   char *pwd;
   struct stat dotstat, pwdstat;
   Lisp_Object temp;
@@ -5138,40 +5133,28 @@ init_buffer ()
   if (NILP (buffer_defaults.enable_multibyte_characters))
     Fset_buffer_multibyte (Qnil);
 
-  /* If PWD is accurate, use it instead of calling getwd.  PWD is
-     sometimes a nicer name, and using it may avoid a fatal error if a
-     parent directory is searchable but not readable.  */
-  if ((pwd = getenv ("PWD")) != 0
-      && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1])))
-      && stat (pwd, &pwdstat) == 0
-      && stat (".", &dotstat) == 0
-      && dotstat.st_ino == pwdstat.st_ino
-      && dotstat.st_dev == pwdstat.st_dev
-      && strlen (pwd) < MAXPATHLEN)
-    strcpy (buf, pwd);
-#ifdef HAVE_GETCWD
-  else if (getcwd (buf, MAXPATHLEN+1) == 0)
-    fatal ("`getcwd' failed: %s\n", strerror (errno));
-#else
-  else if (getwd (buf) == 0)
-    fatal ("`getwd' failed: %s\n", buf);
-#endif
+  pwd = get_current_dir_name ();
+
+  if (!pwd)
+    fatal ("`get_current_dir_name' failed: %s\n", strerror (errno));
 
 #ifndef VMS
   /* Maybe this should really use some standard subroutine
      whose definition is filename syntax dependent.  */
-  rc = strlen (buf);
-  if (!(IS_DIRECTORY_SEP (buf[rc - 1])))
+  rc = strlen (pwd);
+  if (!(IS_DIRECTORY_SEP (pwd[rc - 1])))
     {
-      buf[rc] = DIRECTORY_SEP;
-      buf[rc + 1] = '\0';
+      /* Grow buffer to add directory separator and '\0'.  */
+      pwd = (char *) xrealloc (pwd, rc + 2);
+      pwd[rc] = DIRECTORY_SEP;
+      pwd[rc + 1] = '\0';
     }
 #endif /* not VMS */
 
-  current_buffer->directory = make_unibyte_string (buf, strlen (buf));
+  current_buffer->directory = make_unibyte_string (pwd, strlen (pwd));
   if (! NILP (buffer_defaults.enable_multibyte_characters))
-    /* At this momemnt, we still don't know how to decode the
-       direcotry name.  So, we keep the bytes in multibyte form so
+    /* At this moment, we still don't know how to decode the
+       directory name.  So, we keep the bytes in multibyte form so
        that ENCODE_FILE correctly gets the original bytes.  */
     current_buffer->directory
       = string_to_multibyte (current_buffer->directory);
@@ -5190,6 +5173,8 @@ init_buffer ()
 
   temp = get_minibuffer (0);
   XBUFFER (temp)->directory = current_buffer->directory;
+
+  free (pwd);
 }
 
 /* initialize the buffer routines */
diff --git a/src/config.in b/src/config.in
index dc2c07667fb..69c7543bfab 100644
--- a/src/config.in
+++ b/src/config.in
@@ -221,6 +221,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `getwd' function. */
 #undef HAVE_GETWD
 
+/* Define to 1 if you have the `get_current_dir_name' function. */
+#undef HAVE_GET_CURRENT_DIR_NAME
+
 /* Define to 1 if you have the ungif library (-lungif). */
 #undef HAVE_GIF
 
diff --git a/src/lisp.h b/src/lisp.h
index 8f37c715c29..cba8bd31801 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3110,6 +3110,9 @@ struct tty_display_info;
 struct device;
 
 /* defined in sysdep.c */
+#ifndef HAVE_GET_CURRENT_DIR_NAME
+extern char *get_current_dir_name P_ ((void));
+#endif
 extern void stuff_char P_ ((char c));
 extern void init_sigio P_ ((int));
 extern void sys_subshell P_ ((void));
diff --git a/src/sysdep.c b/src/sysdep.c
index 9ffb167bdf0..114300b6784 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -49,7 +49,6 @@ extern void srandom P_ ((unsigned int));
 #include "sysselect.h"
 
 #include "blockinput.h"
-#undef NULL
 
 #ifdef MAC_OS8
 /* It is essential to include stdlib.h so that this file picks up
@@ -190,6 +189,7 @@ extern int quit_char;
 #define _P_WAIT 0
 int _CRTAPI1 _spawnlp (int, const char *, const char *, ...);
 int _CRTAPI1 _getpid (void);
+extern char *getwd (char *);
 #endif
 
 #ifdef NONSYSTEM_DIR_LIBRARY
@@ -256,6 +256,81 @@ void hft_reset P_ ((struct tty_display_info *));
 
 SIGMASKTYPE sigprocmask_set;
 
+
+#ifndef HAVE_GET_CURRENT_DIR_NAME
+
+/* Return the current working directory.  Returns NULL on errors.
+   Any other returned value must be freed with free. This is used
+   only when get_current_dir_name is not defined on the system.  */
+char*
+get_current_dir_name ()
+{
+  char *buf;
+  char *pwd;
+  struct stat dotstat, pwdstat;
+  /* If PWD is accurate, use it instead of calling getwd.  PWD is
+     sometimes a nicer name, and using it may avoid a fatal error if a
+     parent directory is searchable but not readable.  */
+    if ((pwd = getenv ("PWD")) != 0
+      && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1])))
+      && stat (pwd, &pwdstat) == 0
+      && stat (".", &dotstat) == 0
+      && dotstat.st_ino == pwdstat.st_ino
+      && dotstat.st_dev == pwdstat.st_dev
+#ifdef MAXPATHLEN
+      && strlen (pwd) < MAXPATHLEN
+#endif
+      )
+    {
+      buf = (char *) malloc (strlen (pwd) + 1);
+      if (!buf)
+        return NULL;
+      strcpy (buf, pwd);
+    }
+#ifdef HAVE_GETCWD
+  else
+    {
+      size_t buf_size = 1024;
+      buf = (char *) malloc (buf_size);
+      if (!buf)
+        return NULL;
+      for (;;)
+        {
+          if (getcwd (buf, buf_size) == buf)
+            break;
+          if (errno != ERANGE)
+            {
+              int tmp_errno = errno;
+              free (buf);
+              errno = tmp_errno;
+              return NULL;
+            }
+          buf_size *= 2;
+          buf = (char *) realloc (buf, buf_size);
+          if (!buf)
+            return NULL;
+        }
+    }
+#else
+  else
+    {
+      /* We need MAXPATHLEN here.  */
+      buf = (char *) malloc (MAXPATHLEN + 1);
+      if (!buf)
+        return NULL;
+      if (getwd (buf) == NULL)
+        {
+          int tmp_errno = errno;
+          free (buf);
+          errno = tmp_errno;
+          return NULL;
+        }
+    }
+#endif
+  return buf;
+}
+#endif
+
 
 /* Discard pending input on all input descriptors.  */
 
diff --git a/src/xsmfns.c b/src/xsmfns.c
index fc427a29790..dc5ebdf1ebd 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -53,11 +53,6 @@ Boston, MA 02110-1301, USA.  */
 #include "termopts.h"
 #include "xterm.h"
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif /* not MAXPATHLEN */
-
-
 /* The user login name.  */
 
 extern Lisp_Object Vuser_login_name;
@@ -206,7 +201,7 @@ smc_save_yourself_CB (smcConn,
   int val_idx = 0;
   int props_idx = 0;
 
-  char cwd[MAXPATHLEN+1];
+  char *cwd = NULL;
   char *smid_opt;
 
   /* How to start a new instance of Emacs.  */
@@ -260,12 +255,9 @@ smc_save_yourself_CB (smcConn,
   props[props_idx]->vals[0].value = SDATA (Vuser_login_name);
   ++props_idx;
 
-  /* The current directory property, not mandatory.  */
-#ifdef HAVE_GETCWD
-  if (getcwd (cwd, MAXPATHLEN+1) != 0)
-#else
-  if (getwd (cwd) != 0)
-#endif
+  cwd = get_current_dir_name ();
+
+  if (cwd)
     {
       props[props_idx] = &prop_ptr[props_idx];
       props[props_idx]->name = SmCurrentDirectory;
@@ -282,6 +274,9 @@ smc_save_yourself_CB (smcConn,
 
   xfree (smid_opt);
 
+  if (cwd)
+    free (cwd);
+
   /* See if we maybe shall interact with the user.  */
   if (interactStyle != SmInteractStyleAny
       || ! shutdown