Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-91

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 581-597)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 133-141)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: texi/gnus.texi (RSS): Fix key description.
   - Update from CVS: texi/gnus.texi (Document Server Internals): Addition.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/buffer.c b/src/buffer.c
index ae2a584e506..e8a45f42342 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5130,7 +5130,7 @@ init_buffer ()
   char *pwd;
   struct stat dotstat, pwdstat;
   Lisp_Object temp;
-  int rc;
+  int len;
 
 #ifdef USE_MMAP_FOR_BUFFERS
  {
@@ -5157,13 +5157,13 @@ init_buffer ()
 #ifndef VMS
   /* Maybe this should really use some standard subroutine
      whose definition is filename syntax dependent.  */
-  rc = strlen (pwd);
-  if (!(IS_DIRECTORY_SEP (pwd[rc - 1])))
+  len = strlen (pwd);
+  if (!(IS_DIRECTORY_SEP (pwd[len - 1])))
     {
       /* Grow buffer to add directory separator and '\0'.  */
-      pwd = (char *) xrealloc (pwd, rc + 2);
-      pwd[rc] = DIRECTORY_SEP;
-      pwd[rc + 1] = '\0';
+      pwd = (char *) xrealloc (pwd, len + 2);
+      pwd[len] = DIRECTORY_SEP;
+      pwd[len + 1] = '\0';
     }
 #endif /* not VMS */