Merged from miles@gnu.org--gnu-2005 (patch 174-181, 685-690)

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-179
   Update from CVS: texi/gnus.texi (RSS): Addition.

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

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

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

4 files changed, 66 insertions, 16 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 3c77720a49a..1b8d17607ff 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 2000, 01, 2004, 2005
+# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 2000, 01, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
diff --git a/src/ChangeLog b/src/ChangeLog
index 54c41d66413..e722bf78945 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2006-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Fexpand_file_name): Remove redundant tests.
+        Fix elimination of // so that it doesn't prevent elimination of an
+        immediately following /. or /..
+
+2006-01-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_toggle_notify_cb): New function.
+        (xg_toggle_visibility_cb): Move setting of x_gtk_show_hidden_files to
+        xg_toggle_notify_cb.
+        (xg_get_file_with_chooser): Add callback to xg_toggle_notify_cb when
+        parameter value changes so the toggle button gets updated.
+
 2006-01-06  Nick Roberts  <nickrob@snap.net.nz>
 
         * .gdbinit: Fix typo.
diff --git a/src/fileio.c b/src/fileio.c
index add62fe5426..1ec443e44e0 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1,7 +1,7 @@
 /* File IO for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1646,8 +1646,7 @@ See also the function `substitute-in-file-name'.  */)
         {
           *o++ = *p++;
         }
-      else if (IS_DIRECTORY_SEP (p[0])
-               && p[1] == '.'
+      else if (p[1] == '.'
                && (IS_DIRECTORY_SEP (p[2])
                    || p[2] == 0))
         {
@@ -1657,7 +1656,7 @@ See also the function `substitute-in-file-name'.  */)
             *o++ = *p;
           p += 2;
         }
-      else if (IS_DIRECTORY_SEP (p[0]) && p[1] == '.' && p[2] == '.'
+      else if (p[1] == '.' && p[2] == '.'
                /* `/../' is the "superroot" on certain file systems.
                   Turned off on DOS_NT systems because they have no
                   "superroot" and because this causes us to produce
@@ -1677,14 +1676,9 @@ See also the function `substitute-in-file-name'.  */)
             ++o;
           p += 3;
         }
-      else if (p > target
-               && IS_DIRECTORY_SEP (p[0]) && IS_DIRECTORY_SEP (p[1]))
-        {
-          /* Collapse multiple `/' in a row.  */
-          *o++ = *p++;
-          while (IS_DIRECTORY_SEP (*p))
-            ++p;
-        }
+      else if (p > target && IS_DIRECTORY_SEP (p[1]))
+        /* Collapse multiple `/' in a row.  */
+        p++;
       else
         {
           *o++ = *p++;
diff --git a/src/gtkutil.c b/src/gtkutil.c
index ce66c5de35e..065adeb4937 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1220,6 +1220,9 @@ xg_get_file_name_from_chooser (w)
   return gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (w));
 }
 
+/* Callback called when the "Show hidden files" toggle is pressed.
+   WIDGET is the toggle widget, DATA is the file chooser dialog.  */
+
 static void
 xg_toggle_visibility_cb (widget, data)
      GtkWidget *widget;
@@ -1227,10 +1230,47 @@ xg_toggle_visibility_cb (widget, data)
 {
   GtkFileChooser *dialog = GTK_FILE_CHOOSER (data);
   gboolean visible;
-  extern int x_gtk_show_hidden_files;
   g_object_get (G_OBJECT (dialog), "show-hidden", &visible, NULL);
   g_object_set (G_OBJECT (dialog), "show-hidden", !visible, NULL);
-  x_gtk_show_hidden_files = !visible;
+}
+
+
+/* Callback called when a property changes in a file chooser.
+   GOBJECT is the file chooser dialog, ARG1 describes the property.
+   USER_DATA is the toggle widget in the file chooser dialog.
+   We use this to update the "Show hidden files" toggle when the user
+   changes that property by right clicking in the file list.  */
+
+static void
+xg_toggle_notify_cb (gobject, arg1, user_data)
+     GObject *gobject;
+     GParamSpec *arg1;
+     gpointer user_data;
+{
+  extern int x_gtk_show_hidden_files;
+
+  if (strcmp (arg1->name, "show-hidden") == 0)
+    {
+      GtkFileChooser *dialog = GTK_FILE_CHOOSER (gobject);
+      GtkWidget *wtoggle = GTK_WIDGET (user_data);
+      gboolean visible, toggle_on;
+
+      g_object_get (G_OBJECT (gobject), "show-hidden", &visible, NULL);
+      toggle_on = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (wtoggle));
+
+      if (!!visible != !!toggle_on)
+        {
+          g_signal_handlers_block_by_func (G_OBJECT (wtoggle),
+                                           G_CALLBACK (xg_toggle_visibility_cb),
+                                           gobject);
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wtoggle), visible);
+          g_signal_handlers_unblock_by_func
+            (G_OBJECT (wtoggle),
+             G_CALLBACK (xg_toggle_visibility_cb),
+             gobject);
+        }
+      x_gtk_show_hidden_files = visible;
+    }
 }
 
 /* Read a file name from the user using a file chooser dialog.
@@ -1283,7 +1323,9 @@ xg_get_file_with_chooser (f, prompt, default_filename,
     }
   gtk_widget_show (wtoggle);
   g_signal_connect (G_OBJECT (wtoggle), "clicked",
-                    G_CALLBACK (xg_toggle_visibility_cb), G_OBJECT(filewin));
+                    G_CALLBACK (xg_toggle_visibility_cb), filewin);
+  g_signal_connect (G_OBJECT (filewin), "notify",
+                    G_CALLBACK (xg_toggle_notify_cb), wtoggle);
 
   message[0] = '\0';
   if (action != GTK_FILE_CHOOSER_ACTION_SAVE)