Merged in changes from CVS trunk

Patches applied:

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-203
   Add entry for macroexpand-all to NEWS

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-205
   Add macroexpand-all to lisp reference manual

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-210
   More RCS keyword removal

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-211
   File-permission tweaks

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-212
   Checkout from CVS with unexpanded RCS keywords


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

7 files changed, 70 insertions, 16 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b5144e5b56..6d48aa0f6d0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,35 @@
+2004-04-12  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * buffer.c (Fmake_indirect_buffer): Throw an error if the intended
+        base buffer has been killed.  Correct the error message if the
+        base buffer does not exist.
+
+2004-04-12  Joe Buehler  <jbuehler@hekimian.com>
+
+        * s/cygwin.h: Changes for Cygwin unexec() support, changes in
+        Cygwin itself.  Add support for Xaw3d scrollbars.
+
+        * puresize.h: Set up PURE_P() for Cygwin unexec() support.
+
+        * lastfile.c: Define my_endbss[] for Cygwin unexec() support.
+
+        * gmalloc.c (__default_morecore): Use bss_sbrk(), not __sbrk(),
+        before Cygwin unexec.
+
+        * Makefile.in: Link changes for Cygwin unexec() support.
+
+2004-04-12  Andreas Schwab  <schwab@suse.de>
+
+        * buffer.c (Fmake_indirect_buffer): Check that NAME is a string.
+
+2004-04-11  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * buffer.c (Fgenerate_new_buffer_name): Return NAME argument if
+        IGNORE argument equals NAME.  Doc fix.
+
 2004-04-11  Masatake YAMATO  <jet@gyve.org>
 
-        * buffer.c (fix_start_end_in_overlays): make overlays 
+        * buffer.c (fix_start_end_in_overlays): Make overlays
         empty if they are backwards.
 
 2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/src/Makefile.in b/src/Makefile.in
index 618d8de1f96..e22abf754fd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for GNU Emacs.
-# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 2001, 2003
+# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 01, 03, 2004
 # Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -564,6 +564,10 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o
 #endif
 #endif
 
+#ifdef CYGWIN
+CYGWIN_OBJ = sheap.o
+#endif
+
 #ifdef HAVE_CARBON
 mac = $(dot)$(dot)/mac/
 MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o image.o
@@ -586,7 +590,7 @@ obj=    dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
         process.o callproc.o \
         region-cache.o sound.o atimer.o \
         doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
-        $(MSDOS_OBJ) $(MAC_OBJ)
+        $(MSDOS_OBJ) $(MAC_OBJ) $(CYGWIN_OBJ)
 
 /* Object files used on some machine or other.
    These go in the DOC file on all machines
@@ -643,7 +647,12 @@ widgetobj=
 
 /* define otherobj as list of object files that make-docfile
    should not be told about.  */
+#ifdef CYGWIN
+/* Cygwin differs because of its unexec(). */
+otherobj= $(termcapobj) $(gmallocobj) $(rallocobj) lastfile.o vm-limit.o $(allocaobj) $(widgetobj) $(LIBOBJS)
+#else
 otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBOBJS)
+#endif
 
 #ifdef HAVE_MOUSE
 #define MOUSE_SUPPORT ${lispsource}mouse.elc \
diff --git a/src/buffer.c b/src/buffer.c
index 455b03efec2..ca74dda73bf 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -521,7 +521,7 @@ DEFUN ("make-indirect-buffer", Fmake_indirect_buffer, Smake_indirect_buffer,
        2, 3,
        "bMake indirect buffer (to buffer): \nBName of indirect buffer: ",
        doc: /* Create and return an indirect buffer for buffer BASE-BUFFER, named NAME.
-BASE-BUFFER should be an existing buffer (or buffer name).
+BASE-BUFFER should be a live buffer, or the name of an existing buffer.
 NAME should be a string which is not the name of an existing buffer.
 Optional argument CLONE non-nil means preserve BASE-BUFFER's state,
 such as major and minor modes, in the indirect buffer.
@@ -529,16 +529,20 @@ CLONE nil means the indirect buffer's state is reset to default values.  */)
      (base_buffer, name, clone)
      Lisp_Object base_buffer, name, clone;
 {
-  Lisp_Object buf;
+  Lisp_Object buf, tem;
   struct buffer *b;
 
+  CHECK_STRING (name);
   buf = Fget_buffer (name);
   if (!NILP (buf))
     error ("Buffer name `%s' is in use", SDATA (name));
 
+  tem = base_buffer;
   base_buffer = Fget_buffer (base_buffer);
   if (NILP (base_buffer))
-    error ("No such buffer: `%s'", SDATA (name));
+    error ("No such buffer: `%s'", SDATA (tem));
+  if (NILP (XBUFFER (base_buffer)->name))
+    error ("Base buffer has been killed");
 
   if (SCHARS (name) == 0)
     error ("Empty string for buffer name is not allowed");
@@ -652,7 +656,7 @@ delete_all_overlays (b)
 }
 
 /* Reinitialize everything about a buffer except its name and contents
-   and local variables. 
+   and local variables.
    If called on an already-initialized buffer, the list of overlays
    should be deleted before calling this function, otherwise we end up
    with overlays that claim to belong to the buffer but the buffer
@@ -766,7 +770,7 @@ DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buff
        doc: /* Return a string that is the name of no existing buffer based on NAME.
 If there is no live buffer named NAME, then return NAME.
 Otherwise modify name by appending `<NUMBER>', incrementing NUMBER
-until an unused name is found, and then return that name.
+\(starting at 2) until an unused name is found, and then return that name.
 Optional second argument IGNORE specifies a name that is okay to use
 \(if it is in the sequence to be tried)
 even if a buffer with that name exists.  */)
@@ -779,6 +783,9 @@ even if a buffer with that name exists.  */)
 
   CHECK_STRING (name);
 
+  tem = Fstring_equal (name, ignore);
+  if (!NILP (tem))
+    return name;
   tem = Fget_buffer (name);
   if (NILP (tem))
     return name;
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 99fa36d073a..eae83a74eb6 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -352,6 +352,10 @@ Cambridge, MA 02139, USA.
 #include <errno.h>
 
 /* How to really get more memory.  */
+#if defined(CYGWIN)
+extern __ptr_t bss_sbrk PP ((ptrdiff_t __size));
+extern int bss_sbrk_did_unexec;
+#endif
 __ptr_t (*__morecore) PP ((ptrdiff_t __size)) = __default_morecore;
 
 /* Debugging hook for `malloc'.  */
@@ -1572,7 +1576,14 @@ __ptr_t
 __default_morecore (increment)
      __malloc_ptrdiff_t increment;
 {
-  __ptr_t result = (__ptr_t) __sbrk (increment);
+  __ptr_t result;
+#if defined(CYGWIN)
+  if (!bss_sbrk_did_unexec)
+    {
+      return bss_sbrk (increment);
+    }
+#endif
+  result = (__ptr_t) __sbrk (increment);
   if (result == (__ptr_t) -1)
     return NULL;
   return result;
diff --git a/src/lastfile.c b/src/lastfile.c
index 0e94a4f1598..df678b42876 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA.  */
 
 char my_edata[] = "End of Emacs initialized data";
 
-#ifdef WINDOWSNT
+#if defined(WINDOWSNT) || defined(CYGWIN)
 /* Help unexec locate the end of the .bss area used by Emacs (which
    isn't always a separate section in NT executables).  */
 char my_endbss[1];
diff --git a/src/puresize.h b/src/puresize.h
index 6ca10b22fdf..8088a374765 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -68,7 +68,7 @@ extern void pure_write_error P_ ((void));
 
 /* Define PURE_P.  */
 
-#ifdef VIRT_ADDR_VARIES
+#if defined(VIRT_ADDR_VARIES) || defined(CYGWIN)
 /* For machines like APOLLO where text and data can go anywhere
    in virtual memory.  */
 
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 033eb636966..38e346ac510 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -115,10 +115,8 @@ Boston, MA 02111-1307, USA.  */
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 #define GETPGRP_NO_ARG 1
 #define SYSV_SYSTEM_DIR 1
-/* -lutil comes from inetutils and has pty functions in it */
-#define LIBS_SYSTEM -lutil
-/* undumping is not implemented yet */
-#define CANNOT_DUMP 1
+#define LIB_STANDARD_LIBSRC
+#define UNEXEC unexcw.o
 #define POSIX_SIGNALS 1
 /* force the emacs image to start high in memory, so dll relocation
    can put things in low memory without causing all sorts of grief for
@@ -137,7 +135,7 @@ Boston, MA 02111-1307, USA.  */
 /*#define HAVE_VFORK*/
 /* Xaw3d causes problems -- might have been fixed by NARROWPROTO
    above, but I haven't tried it */
-#undef HAVE_XAW3D
+/*#undef HAVE_XAW3D*/
 
 /* vfork() interacts badly with setsid(), causing ptys to fail to
    change their controlling terminal */