Merged from miles@gnu.org--gnu-2005 (patch 681)

Patches applied:

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

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

13 files changed, 180 insertions, 26 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f14f216f1d3..4f6cb895004 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,69 @@
+2005-12-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_get_file_with_chooser): Changed message shown
+        in file chooser.
+
+2005-12-27  Richard M. Stallman  <rms@gnu.org>
+
+        * lread.c (readevalloop): Set PT and ZV in the proper buffer,
+        not the current one.
+
+        * minibuf.c (Fminibuffer_message): Doc fix.
+        (read_minibuf): Set current_buffer->enable_multibyte_characters sooner.
+
+        * eval.c (do_autoload): Ignore elements of Vautoload_queue
+        where car is not symbol.
+
+2005-12-27  Kenichi Handa  <handa@m17n.org>
+
+        * charset.c (lisp_string_width): Check multibyteness of STRING.
+
+2005-12-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xfns.c: x_show_hidden_files, new variable.
+        (syms_of_xfns): Defvar it.
+
+        * gtkutil.c (xg_toggle_visibility_cb): New function.
+        (xg_get_file_with_chooser): Add toggle hidden files and a message
+        to the new file chooser dialog.  Show hidden files if
+        x_show_hidden_files is non-zero.
+
+2005-12-26  Richard M. Stallman  <rms@gnu.org>
+
+        * keyboard.h: Undo previous change.
+
+        * Makefile.in (undo.o): Undo previous change.
+
+        * undo.c: Undo previous change.
+
+2005-12-26  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * keyboard.h: extern last_point_position_window.
+
+        * undo.c: include keyboard.h.
+
+        * Makefile.in (undo.o): Depend on keyboard.h.
+
+2005-12-26  Richard M. Stallman  <rms@gnu.org>
+
+        * commands.h (last_point_position_window): Declare.
+
+        * undo.c: Depend on window.h.
+        (record_point): Save old point from the correct window.
+
+        * keyboard.c (last_point_position_window): New variable.
+        (command_loop_1): Set last_point_position_window.
+        (syms_of_keyboard): Init it.
+
+        * Makefile.in (undo.o): Depend on window.h.
+
+2005-12-25  Richard M. Stallman  <rms@gnu.org>
+
+        * eval.c (un_autoload): Expect (0 . OFEATURES) in Vautoload_queue
+        to undo a `provide'.
+
+        * fns.c (Fprovide): Store (0 . OFEATURES) in Vautoload_queue.
+
 2005-12-25  Giorgos Keramidas  <keramida@ceid.upatras.gr>
 
         * m/amdx86-64.h [__FreeBSD__] (START_FILES, LIB_STANDARD):
diff --git a/src/Makefile.in b/src/Makefile.in
index 1054b76ac14..4b40e5acecb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1175,7 +1175,7 @@ terminal.o: terminal.c frame.h termchar.h termhooks.h charset.h coding.h \
    keyboard.h $(config_h)
 terminfo.o: terminfo.c $(config_h)
 tparam.o: tparam.c $(config_h)
-undo.o: undo.c buffer.h commands.h $(config_h)
+undo.o: undo.c buffer.h commands.h window.h $(config_h)
 /* This hack is to discard any space that cpp might put at the beginning
    of UNEXEC when substituting it in.  */
 UNEXEC_ALIAS=UNEXEC
diff --git a/src/charset.c b/src/charset.c
index 2c985b14dbc..fb9804c0306 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1344,6 +1344,10 @@ lisp_string_width (string, precision, nchars, nbytes)
 {
   int len = SCHARS (string);
   int len_byte = SBYTES (string);
+  /* This set multibyte to 0 even if STRING is multibyte when it
+     contains only ascii and eight-bit-graphic, but that's
+     intentional.  */
+  int multibyte = len < len_byte;
   const unsigned char *str = SDATA (string);
   int i = 0, i_byte = 0;
   int width = 0;
@@ -1366,8 +1370,12 @@ lisp_string_width (string, precision, nchars, nbytes)
         }
       else if (dp)
         {
-          int c = STRING_CHAR_AND_LENGTH (str + i_byte, len - i_byte, bytes);
+          int c;
 
+          if (multibyte)
+            c = STRING_CHAR_AND_LENGTH (str + i_byte, len - i_byte, bytes);
+          else
+            c = str[i_byte], bytes = 1;
           chars = 1;
           val = DISP_CHAR_VECTOR (dp, c);
           if (VECTORP (val))
@@ -1378,7 +1386,10 @@ lisp_string_width (string, precision, nchars, nbytes)
       else
         {
           chars = 1;
-          PARSE_MULTIBYTE_SEQ (str + i_byte, len_byte - i_byte, bytes);
+          if (multibyte)
+            PARSE_MULTIBYTE_SEQ (str + i_byte, len_byte - i_byte, bytes);
+          else
+            bytes = 1;
           thiswidth = ONE_BYTE_CHAR_WIDTH (str[i_byte]);
         }
 
diff --git a/src/commands.h b/src/commands.h
index c1330af273e..ed46141bf11 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -75,12 +75,15 @@ extern Lisp_Object Vthis_command;
    events until a non-ASCII event is acceptable as input.  */
 extern Lisp_Object unread_switch_frame;
 
-/* The value of point when the last command was executed.  */
+/* The value of point when the last command was started.  */
 extern int last_point_position;
 
 /* The buffer that was current when the last command was started.  */
 extern Lisp_Object last_point_position_buffer;
 
+/* The window that was selected when the last command was started.  */
+extern Lisp_Object last_point_position_window;
+
 /* Nonzero means ^G can quit instantly */
 extern int immediate_quit;
 
diff --git a/src/eval.c b/src/eval.c
index 86859e4ddae..a6c58bc2425 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -103,7 +103,7 @@ Lisp_Object Vrun_hooks;
 /* Non-nil means record all fset's and provide's, to be undone
    if the file being autoloaded is not fully loaded.
    They are recorded by being consed onto the front of Vautoload_queue:
-   (FUN . ODEF) for a defun, (OFEATURES . nil) for a provide.  */
+   (FUN . ODEF) for a defun, (0 . OFEATURES) for a provide.  */
 
 Lisp_Object Vautoload_queue;
 
@@ -2022,8 +2022,8 @@ un_autoload (oldqueue)
       first = XCAR (queue);
       second = Fcdr (first);
       first = Fcar (first);
-      if (EQ (second, Qnil))
-        Vfeatures = first;
+      if (EQ (first, make_number (0)))
+        Vfeatures = second;
       else
         Ffset (first, second);
       queue = XCDR (queue);
@@ -2069,7 +2069,7 @@ do_autoload (fundef, funname)
       second = Fcdr (first);
       first = Fcar (first);
 
-      if (CONSP (second) && EQ (XCAR (second), Qautoload))
+      if (SYMBOLP (first) && CONSP (second) && EQ (XCAR (second), Qautoload))
         Fput (first, Qautoload, (XCDR (second)));
 
       queue = XCDR (queue);
diff --git a/src/fns.c b/src/fns.c
index d30d49a80c7..70b9cf0d30f 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3519,7 +3519,8 @@ particular subfeatures supported in this version of FEATURE.  */)
   CHECK_SYMBOL (feature);
   CHECK_LIST (subfeatures);
   if (!NILP (Vautoload_queue))
-    Vautoload_queue = Fcons (Fcons (Vfeatures, Qnil), Vautoload_queue);
+    Vautoload_queue = Fcons (Fcons (make_number (0), Vfeatures),
+                             Vautoload_queue);
   tem = Fmemq (feature, Vfeatures);
   if (NILP (tem))
     Vfeatures = Fcons (feature, Vfeatures);
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 9da3c5bf457..cb8e5a21860 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1220,6 +1220,19 @@ xg_get_file_name_from_chooser (w)
   return gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (w));
 }
 
+static void
+xg_toggle_visibility_cb (widget, data)
+     GtkWidget *widget;
+     gpointer 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;
+}
+
 /* Read a file name from the user using a file chooser dialog.
    F is the current frame.
    PROMPT is a prompt to show to the user.  May not be NULL.
@@ -1239,11 +1252,14 @@ xg_get_file_with_chooser (f, prompt, default_filename,
      int mustmatch_p, only_dir_p;
      xg_get_file_func *func;
 {
-  GtkWidget *filewin;
+  char message[1024];
+
+  GtkWidget *filewin, *wtoggle, *wbox, *wmessage;
   GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f));
   GtkFileChooserAction action = (mustmatch_p ?
                                  GTK_FILE_CHOOSER_ACTION_OPEN :
                                  GTK_FILE_CHOOSER_ACTION_SAVE);
+  extern int x_gtk_show_hidden_files;
 
   if (only_dir_p)
     action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
@@ -1256,6 +1272,31 @@ xg_get_file_with_chooser (f, prompt, default_filename,
                                          NULL);
   gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filewin), TRUE);
 
+  wbox = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (wbox);
+  wtoggle = gtk_check_button_new_with_label ("Show hidden files.");
+  
+  if (x_gtk_show_hidden_files) 
+    {
+      g_object_set (G_OBJECT (filewin), "show-hidden", TRUE, NULL);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wtoggle), TRUE);
+    }
+  gtk_widget_show (wtoggle);
+  g_signal_connect (G_OBJECT (wtoggle), "clicked",
+                    G_CALLBACK (xg_toggle_visibility_cb), G_OBJECT(filewin));
+
+  message[0] = '\0';
+  if (action != GTK_FILE_CHOOSER_ACTION_SAVE)
+    strcat (message, "\nType C-l to display a file name text entry box.\n");
+  strcat (message, "\nIf you don't like this file selector, customize "
+          "use-file-dialog\nto turn it off, or type C-x C-f to visit files.");
+
+  wmessage = gtk_label_new (message);
+  gtk_widget_show (wmessage);
+  gtk_box_pack_start (GTK_BOX (wbox), wtoggle, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (wbox), wmessage, FALSE, FALSE, 0);
+  gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (filewin), wbox);
+
   if (default_filename)
     {
       Lisp_Object file;
diff --git a/src/keyboard.c b/src/keyboard.c
index 76ff053410e..c47fda8223c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -377,12 +377,15 @@ Lisp_Object real_this_command;
    command is stored in this-original-command.  It is nil otherwise.  */
 Lisp_Object Vthis_original_command;
 
-/* The value of point when the last command was executed.  */
+/* The value of point when the last command was started.  */
 int last_point_position;
 
 /* The buffer that was current when the last command was started.  */
 Lisp_Object last_point_position_buffer;
 
+/* The window that was selected when the last command was started.  */
+Lisp_Object last_point_position_window;
+
 /* The frame in which the last input event occurred, or Qmacro if the
    last event came from a macro.  We use this to determine when to
    generate switch-frame events.  This may be cleared by functions
@@ -1619,6 +1622,7 @@ command_loop_1 ()
       prev_buffer = current_buffer;
       prev_modiff = MODIFF;
       last_point_position = PT;
+      last_point_position_window = selected_window;
       XSETBUFFER (last_point_position_buffer, prev_buffer);
 
       /* By default, we adjust point to a boundary of a region that
@@ -11298,6 +11302,7 @@ syms_of_keyboard ()
   Fset (Qinput_method_use_echo_area, Qnil);
 
   last_point_position_buffer = Qnil;
+  last_point_position_window = Qnil;
 
   {
     struct event_head *p;
diff --git a/src/keyboard.h b/src/keyboard.h
index 48801dff216..45dbd495d28 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -312,7 +312,6 @@ extern Lisp_Object Vfunction_key_map;
 /* Parent keymap of terminal-local key-translation-map instances.  */
 extern Lisp_Object Vkey_translation_map;
 
-
 extern int parse_menu_item P_ ((Lisp_Object, int, int));
 
 extern void echo_now P_ ((void));
diff --git a/src/lread.c b/src/lread.c
index e6f1987a50b..6555737fa55 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1345,10 +1345,20 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
       if (b != 0 && NILP (b->name))
         error ("Reading from killed buffer");
 
+
       if (!NILP (start))
         {
+          /* Switch to the buffer we are reading from.  */
+          record_unwind_protect (save_excursion_restore, save_excursion_save ());
+          set_buffer_internal (b);
+
+          /* Save point in it.  */
           record_unwind_protect (save_excursion_restore, save_excursion_save ());
+          /* Save ZV in it.  */
           record_unwind_protect (save_restriction_restore, save_restriction_save ());
+          /* Those get unbound after we read one expression.  */
+
+          /* Set point and ZV around stuff to be read.  */
           Fgoto_char (start);
           Fnarrow_to_region (make_number (BEGV), end);
         }
diff --git a/src/minibuf.c b/src/minibuf.c
index af7fa60aba4..4025226574d 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -602,6 +602,10 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
   minibuffer = get_minibuffer (minibuf_level);
   Fset_buffer (minibuffer);
 
+  /* If appropriate, copy enable-multibyte-characters into the minibuffer.  */
+  if (inherit_input_method)
+    current_buffer->enable_multibyte_characters = enable_multibyte;
+
   /* The current buffer's default directory is usually the right thing
      for our minibuffer here.  However, if you're typing a command at
      a minibuffer-only frame when minibuf_level is zero, then buf IS
@@ -673,10 +677,6 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
 
   minibuf_prompt_width = (int) current_column (); /* iftc */
 
-  /* If appropriate, copy enable-multibyte-characters into the minibuffer.  */
-  if (inherit_input_method)
-    current_buffer->enable_multibyte_characters = enable_multibyte;
-
   /* Put in the initial input.  */
   if (!NILP (initial))
     {
@@ -1244,11 +1244,11 @@ is used to further constrain the set of candidates.  */)
   int bestmatchsize = 0;
   /* These are in bytes, too.  */
   int compare, matchsize;
-  int type = HASH_TABLE_P (alist) ? 3
-    : VECTORP (alist) ? 2
-    : NILP (alist) || (CONSP (alist)
-                       && (!SYMBOLP (XCAR (alist))
-                           || NILP (XCAR (alist))));
+  int type = (HASH_TABLE_P (alist) ? 3
+              : VECTORP (alist) ? 2
+              : NILP (alist) || (CONSP (alist)
+                                 && (!SYMBOLP (XCAR (alist))
+                                     || NILP (XCAR (alist)))));
   int index = 0, obsize = 0;
   int matchcount = 0;
   int bindcount = -1;
@@ -2692,7 +2692,7 @@ temp_echo_area_glyphs (string)
 DEFUN ("minibuffer-message", Fminibuffer_message, Sminibuffer_message,
        1, 1, 0,
        doc: /* Temporarily display STRING at the end of the minibuffer.
-The text is displayed for two seconds,
+The text is displayed for a period controlled by `minibuffer-message-timeout',
 or until the next input event arrives, whichever comes first.  */)
      (string)
      Lisp_Object string;
diff --git a/src/undo.c b/src/undo.c
index ecbb714fddd..bf774affac5 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -24,6 +24,7 @@ Boston, MA 02110-1301, USA.  */
 #include "lisp.h"
 #include "buffer.h"
 #include "commands.h"
+#include "window.h"
 
 /* Limits controlling how much undo information to keep.  */
 
@@ -100,12 +101,19 @@ record_point (pt)
   /* If we are just after an undo boundary, and
      point wasn't at start of deleted range, record where it was.  */
   if (at_boundary
-      && last_point_position != pt
-      /* If we're called from batch mode, this could be nil.  */
       && BUFFERP (last_point_position_buffer)
+      /* If we're called from batch mode, this could be nil.  */
       && current_buffer == XBUFFER (last_point_position_buffer))
-    current_buffer->undo_list
-      = Fcons (make_number (last_point_position), current_buffer->undo_list);
+    {
+      /* If we have switched windows, use the point value
+         from the window we are in.  */
+      if (! EQ (last_point_position_window, selected_window))
+        last_point_position = marker_position (XWINDOW (selected_window)->pointm);
+
+      if (last_point_position != pt)
+        current_buffer->undo_list
+          = Fcons (make_number (last_point_position), current_buffer->undo_list);
+    }
 }
 
 /* Record an insertion that just happened or is about to happen,
diff --git a/src/xfns.c b/src/xfns.c
index 2aa237ec549..7bf302594be 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -155,6 +155,10 @@ int display_hourglass_p;
 
 int x_use_old_gtk_file_dialog;
 
+/* If non-zero, by default show hidden files in the GTK file chooser.  */
+
+int x_gtk_show_hidden_files;
+
 /* The background and shape of the mouse pointer, and shape when not
    over text or in the modeline.  */
 
@@ -5790,6 +5794,12 @@ chooser is used instead.  To turn off all file dialogs set the
 variable `use-file-dialog'.  */);
   x_use_old_gtk_file_dialog = 0;
 
+  DEFVAR_BOOL ("x-gtk-show-hidden-files", &x_gtk_show_hidden_files,
+    doc: /* *If non-nil, the GTK file chooser will by default show hidden files.
+Note that this is just the default, there is a toggle button on the file
+chooser to show or not show hidden files on a case by case basis.  */);
+  x_gtk_show_hidden_files = 0;
+
   Fprovide (intern ("x"), Qnil);
 
 #ifdef USE_X_TOOLKIT