Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-420
   Tweak permissions

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

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

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

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

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

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


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

6 files changed, 64 insertions, 48 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6fae7580745..383f479aabd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,33 @@
+2004-06-27  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (file_dialog_callback): Disable edit control if set
+        to directories only on CDN_INITDONE message.
+        (Fx_file_dialog): Default to directories only when prompt starts
+        with "Dired".
+
+2004-06-25  Kim F. Storm  <storm@cua.dk>
+
+        * alloc.c (allocate_misc): Update total_free_markers.
+        (free_misc): New function.
+        (safe_alloca_unwind, free_marker): Use it.
+
+        * lisp.h (free_misc): Add prototype.
+
+        * fns.c (Fmapconcat, Fmapcar): Remove superfluous GCPROs.
+
+2004-06-24  Richard M. Stallman  <rms@gnu.org>
+
+        * emacs.c (Vsignal_USR1_hook, Vsignal_USR2_hook): Definitions deleted.
+        (syms_of_emacs): Lisp variables deleted.
+
 2004-06-23  David Kastrup  <dak@gnu.org>
 
-        * search.c (Freplace_match): Adjust the match-data more
-        thoroughly when replacing strings in the buffer.
-        search.c (match-data): When INTEGERS is non-nil and the last match
-        was in a buffer, add the buffer as last element to the match data.
-        (Fset_match_data): If an additional element of the match-data is
-        a buffer, restore it to last_thing_searched.
+        * search.c (Freplace_match): Adjust the match-data more thoroughly
+        when replacing strings in the buffer.
+        (Fmatch_data): When INTEGERS is non-nil and the last match was in
+        a buffer, add the buffer as last element to the match data.
+        (Fset_match_data): If an additional element of the match-data is a
+        buffer, restore it to last_thing_searched.
         (save_search_regs): Save last_thing_searched as part of the match
         data.
         (restore_match_data): Restore it again.
diff --git a/src/alloc.c b/src/alloc.c
index baf7afa0094..5dc8d186369 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -591,6 +591,7 @@ safe_alloca_unwind (arg)
   p->dogc = 0;
   xfree (p->pointer);
   p->pointer = 0;
+  free_misc (arg);
   return Qnil;
 }
 
@@ -2922,17 +2923,32 @@ allocate_misc ()
           marker_block = new;
           marker_block_index = 0;
           n_marker_blocks++;
+          total_free_markers += MARKER_BLOCK_SIZE;
         }
       XSETMISC (val, &marker_block->markers[marker_block_index]);
       marker_block_index++;
     }
 
+  --total_free_markers;
   consing_since_gc += sizeof (union Lisp_Misc);
   misc_objects_consed++;
   XMARKER (val)->gcmarkbit = 0;
   return val;
 }
 
+/* Free a Lisp_Misc object */
+
+void
+free_misc (misc)
+     Lisp_Object misc;
+{
+  XMISC (misc)->u_marker.type = Lisp_Misc_Free;
+  XMISC (misc)->u_free.chain = marker_free_list;
+  marker_free_list = XMISC (misc);
+
+  total_free_markers++;
+}
+
 /* Return a Lisp_Misc_Save_Value object containing POINTER and
    INTEGER.  This is used to package C values to call record_unwind_protect.
    The unwind function can get the C values back using XSAVE_VALUE.  */
@@ -2979,12 +2995,7 @@ free_marker (marker)
      Lisp_Object marker;
 {
   unchain_marker (XMARKER (marker));
-
-  XMISC (marker)->u_marker.type = Lisp_Misc_Free;
-  XMISC (marker)->u_free.chain = marker_free_list;
-  marker_free_list = XMISC (marker);
-
-  total_free_markers++;
+  free_misc (marker);
 }
 
 
diff --git a/src/emacs.c b/src/emacs.c
index 5425d5d64a2..bdca7aa3944 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -127,14 +127,6 @@ Lisp_Object Vkill_emacs_hook;
 /* An empty lisp string.  To avoid having to build any other.  */
 Lisp_Object empty_string;
 
-#ifdef SIGUSR1
-/* Hooks for signal USR1 and USR2 handling.  */
-Lisp_Object Vsignal_USR1_hook;
-#ifdef SIGUSR2
-Lisp_Object Vsignal_USR2_hook;
-#endif
-#endif
-
 /* Search path separator.  */
 Lisp_Object Vpath_separator;
 
@@ -2370,18 +2362,6 @@ The hook is not run in batch mode, i.e., if `noninteractive' is non-nil.  */);
   empty_string = build_string ("");
   staticpro (&empty_string);
 
-#ifdef SIGUSR1
-  DEFVAR_LISP ("signal-USR1-hook", &Vsignal_USR1_hook,
-               doc: /* Hook to be run whenever emacs receives a USR1 signal.  */);
-  Vsignal_USR1_hook = Qnil;
-#ifdef SIGUSR2
-  DEFVAR_LISP ("signal-USR2-hook", &Vsignal_USR2_hook,
-               doc: /* Hook to be run whenever emacs receives a USR2 signal.  */);
-  Vsignal_USR2_hook = Qnil;
-#endif
-#endif
-
-
   DEFVAR_INT ("emacs-priority", &emacs_priority,
               doc: /* Priority for Emacs to run at.
 This value is effective only if set before Emacs is dumped,
diff --git a/src/fns.c b/src/fns.c
index 7e84b775fbb..693f3eaaa93 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3020,11 +3020,7 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string.  */)
   for (i = 1; i < nargs; i += 2)
     args[i] = separator;
 
-  GCPRO1 (*args);
-  gcpro1.nvars = nargs;
   ret = Fconcat (nargs, args);
-  UNGCPRO;
-
   SAFE_FREE_LISP (nargs);
 
   return ret;
@@ -3040,7 +3036,6 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string.  */)
   register Lisp_Object len;
   register int leni;
   register Lisp_Object *args;
-  struct gcpro gcpro1;
   Lisp_Object ret;
   USE_SAFE_ALLOCA;
 
@@ -3051,11 +3046,7 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string.  */)
 
   mapcar1 (leni, args, function, sequence);
 
-  GCPRO1 (*args);
-  gcpro1.nvars = leni;
   ret = Flist (leni, args);
-  UNGCPRO;
-
   SAFE_FREE_LISP (leni);
 
   return ret;
diff --git a/src/lisp.h b/src/lisp.h
index ba2508e827b..44fe5affa57 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2486,6 +2486,7 @@ extern Lisp_Object make_float P_ ((double));
 extern void display_malloc_warning P_ ((void));
 extern int inhibit_garbage_collection P_ ((void));
 extern Lisp_Object make_save_value P_ ((void *, int));
+extern void free_misc P_ ((Lisp_Object));
 extern void free_marker P_ ((Lisp_Object));
 extern void free_cons P_ ((struct Lisp_Cons *));
 extern void init_alloc_once P_ ((void));
diff --git a/src/w32fns.c b/src/w32fns.c
index e7ead136ced..b12bd7be28b 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7686,7 +7686,8 @@ file_dialog_callback (hwnd, msg, wParam, lParam)
     {
       OFNOTIFY * notify = (OFNOTIFY *)lParam;
       /* Detect when the Filter dropdown is changed.  */
-      if (notify->hdr.code == CDN_TYPECHANGE)
+      if (notify->hdr.code == CDN_TYPECHANGE
+          || notify->hdr.code == CDN_INITDONE)
         {
           HWND dialog = GetParent (hwnd);
           HWND edit_control = GetDlgItem (dialog, FILE_NAME_TEXT_FIELD);
@@ -7700,8 +7701,10 @@ file_dialog_callback (hwnd, msg, wParam, lParam)
             }
           else
             {
-              CommDlg_OpenSave_SetControlText (dialog, FILE_NAME_TEXT_FIELD,
-                                               "");
+              /* Don't override default filename on init done.  */
+              if (notify->hdr.code == CDN_TYPECHANGE)
+                CommDlg_OpenSave_SetControlText (dialog,
+                                                 FILE_NAME_TEXT_FIELD, "");
               EnableWindow (edit_control, TRUE);
             }
         }
@@ -7723,6 +7726,7 @@ specified.  Ensure that file exists if MUSTMATCH is non-nil.  */)
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
   char filename[MAX_PATH + 1];
   char init_dir[MAX_PATH + 1];
+  int default_filter_index = 1; /* 1: All Files, 2: Directories only  */
 
   GCPRO5 (prompt, dir, default_filename, mustmatch, file);
   CHECK_STRING (prompt);
@@ -7746,9 +7750,7 @@ specified.  Ensure that file exists if MUSTMATCH is non-nil.  */)
       if (!file_name_only)
         file_name_only = full_path_name;
       else
-        {
-          file_name_only++;
-        }
+        file_name_only++;
 
       strncpy (filename, file_name_only, MAX_PATH);
       filename[MAX_PATH] = '\0';
@@ -7773,6 +7775,15 @@ specified.  Ensure that file exists if MUSTMATCH is non-nil.  */)
     file_details.nMaxFile = sizeof (filename);
     file_details.lpstrInitialDir = init_dir;
     file_details.lpstrTitle = SDATA (prompt);
+
+    /* If prompt starts with Dired, default to directories only.  */
+    /* A bit hacky, but there doesn't seem to be a better way to
+       DTRT for dired.  */
+    if (strncmp (file_details.lpstrTitle, "Dired", 5) == 0)
+      default_filter_index = 2;
+
+    file_details.nFilterIndex = default_filter_index;
+
     file_details.Flags = (OFN_HIDEREADONLY | OFN_NOCHANGEDIR
                           | OFN_EXPLORER | OFN_ENABLEHOOK);
     if (!NILP (mustmatch))
@@ -7785,7 +7796,7 @@ specified.  Ensure that file exists if MUSTMATCH is non-nil.  */)
         dostounix_filename (filename);
         if (file_details.nFilterIndex == 2)
           {
-            /* "Folder Only" selected - strip dummy file name.  */
+            /* "Directories" selected - strip dummy file name.  */
             char * last = strrchr (filename, '/');
             *last = '\0';
           }