9 files changed, 139 insertions, 19 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b3a9386da86..9765ec9403c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,45 @@
+2004-07-17  Juanma Barranquero  <lektu@terra.es>
+
+        * keyboard.c (not_single_kboard_state): Do nothing unless
+        MULTI_KBOARD is defined.
+
+2004-07-17  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (coordinates_in_window): Inside the window but outside
+        its box to the L or R, return ON_VERTICAL_BORDER.
+        (window_list_1): Rotate the list to start with WINDOW.
+
+        * print.c (print_preprocess): Test for print_depth at limit
+        before entering in being_printed.
+
+        * keyboard.c (not_single_kboard_state): New function.
+        (stuff_buffered_input): Now no-op only if no SIGTSTP.
+
+        * frame.c (Fdelete_frame): If we're in single_bboard_state on
+        this kboard, and we delete its last frame, go to any_kboard_state.
+
+        * buffer.c (syms_of_buffer) <transient-mark-mode>: Doc fix.
+
+2004-07-15  KOBAYASHI Yasuhiro  <kobayays@otsukakj.co.jp>  (tiny change)
+
+        * w32fns.c (Fx_file_dialog): Encode strings in system coding
+        system before passing them to OS functions for display.
+
+2004-07-15  David Kastrup  <dak@gnu.org>
+
+        * search.c (syms_of_search): Staticpro `saved_last_thing_searched'.
+        Apparently fixes an abort condition.
+
+2004-07-14  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * fileio.c (Fvisited_file_modtime): Return a list of two integers,
+        instead of a cons.
+
+2004-07-14  K,Ba(Broly L,Bu(Brentey  <lorentey@elte.hu>
+
+        * keyboard.c (echo_dash): Do nothing if there already is a dash
+        at the end of the echo string.
+
 2004-07-12  Kim F. Storm  <storm@cua.dk>
 
         * alloc.c (mark_object): Only look at Lisp_Misc_Save_Value
diff --git a/src/buffer.c b/src/buffer.c
index c5783ade2a0..f55ae7983f4 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5861,7 +5861,10 @@ all windows or just the selected window.
 
 If the value is `lambda', that enables Transient Mark mode temporarily
 until the next buffer modification.  If a command sets the value to `only',
-that enables Transient Mark mode for the following command only.  */);
+that enables Transient Mark mode for the following command only.
+During that following command, the value of `transient-mark-mode'
+is `identity'.  If it is still `identity' at the end of that command,
+it changes to nil.  */);
   Vtransient_mark_mode = Qnil;
 
   DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only,
diff --git a/src/fileio.c b/src/fileio.c
index 2a4d5fb230e..f81566a7656 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5630,13 +5630,17 @@ Next attempt to save will certainly not complain of a discrepancy.  */)
 DEFUN ("visited-file-modtime", Fvisited_file_modtime,
        Svisited_file_modtime, 0, 0, 0,
        doc: /* Return the current buffer's recorded visited file modification time.
-The value is a list of the form (HIGH . LOW), like the time values
+The value is a list of the form (HIGH LOW), like the time values
 that `file-attributes' returns.  If the current buffer has no recorded
 file modification time, this function returns 0.
 See Info node `(elisp)Modification Time' for more details.  */)
      ()
 {
-  return long_to_cons ((unsigned long) current_buffer->modtime);
+  Lisp_Object tcons;
+  tcons = long_to_cons ((unsigned long) current_buffer->modtime);
+  if (CONSP (tcons))
+    return list2 (XCAR (tcons), XCDR (tcons));
+  return tcons;
 }
 
 DEFUN ("set-visited-file-modtime", Fset_visited_file_modtime,
diff --git a/src/frame.c b/src/frame.c
index 41ee5a64bd5..9a0563c6f76 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1553,6 +1553,36 @@ The functions are run with one arg, the frame to be deleted.  */)
         }
     }
 
+  /* If there's no other frame on the same kboard, get out of
+     single-kboard state if we're in it for this kboard.  */
+  {
+    Lisp_Object frames;
+    /* Some frame we found on the same kboard, or nil if there are none.  */
+    Lisp_Object frame_on_same_kboard;
+
+    frame_on_same_kboard = Qnil;
+
+    for (frames = Vframe_list;
+         CONSP (frames);
+         frames = XCDR (frames))
+      {
+        Lisp_Object this;
+        struct frame *f1;
+
+        this = XCAR (frames);
+        if (!FRAMEP (this))
+          abort ();
+        f1 = XFRAME (this);
+
+        if (FRAME_KBOARD (f) == FRAME_KBOARD (f1))
+          frame_on_same_kboard = this;
+      }
+
+    if (NILP (frame_on_same_kboard))
+      not_single_kboard_state (FRAME_KBOARD (f));
+  }
+
+
   /* If we've deleted this keyboard's default_minibuffer_frame, try to
      find another one.  Prefer minibuffer-only frames, but also notice
      frames with other windows.  */
diff --git a/src/keyboard.c b/src/keyboard.c
index 3fc685d58c7..40a545180fe 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -791,6 +791,21 @@ echo_dash ()
       == SCHARS (current_kboard->echo_string))
     return;
 
+  /* Do nothing if we have already put a dash at the end.  */
+  if (SCHARS (current_kboard->echo_string) > 1)
+    {
+          Lisp_Object last_char, prev_char, idx;
+
+          idx = make_number (SCHARS (current_kboard->echo_string) - 2);
+          prev_char = Faref (current_kboard->echo_string, idx);
+
+          idx = make_number (SCHARS (current_kboard->echo_string) - 1);
+          last_char = Faref (current_kboard->echo_string, idx);
+
+          if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
+            return;
+    }
+
   /* Put a dash at the end of the buffer temporarily,
      but make it go away when the next character is added.  */
   current_kboard->echo_string = concat2 (current_kboard->echo_string,
@@ -1063,6 +1078,19 @@ single_kboard_state ()
 #endif
 }
 
+/* If we're in single_kboard state for kboard KBOARD,
+   get out of it.  */
+
+void
+not_single_kboard_state (kboard)
+     KBOARD *kboard;
+{
+#ifdef MULTI_KBOARD
+  if (kboard == current_kboard)
+    single_kboard = 0;
+#endif
+}
+
 /* Maintain a stack of kboards, so other parts of Emacs
    can switch temporarily to the kboard of a given frame
    and then revert to the previous status.  */
@@ -10238,9 +10266,7 @@ void
 stuff_buffered_input (stuffstring)
      Lisp_Object stuffstring;
 {
-/* stuff_char works only in BSD, versions 4.2 and up.  */
-#ifdef BSD_SYSTEM
-#ifndef BSD4_1
+#ifdef SIGTSTP  /* stuff_char is defined if SIGTSTP.  */
   register unsigned char *p;
 
   if (STRINGP (stuffstring))
@@ -10256,7 +10282,10 @@ stuff_buffered_input (stuffstring)
 
   /* Anything we have read ahead, put back for the shell to read.  */
   /* ?? What should this do when we have multiple keyboards??
-     Should we ignore anything that was typed in at the "wrong" kboard?  */
+     Should we ignore anything that was typed in at the "wrong" kboard?
+
+     rms: we should stuff everything back into the kboard
+     it came from.  */
   for (; kbd_fetch_ptr != kbd_store_ptr; kbd_fetch_ptr++)
     {
 
@@ -10269,8 +10298,7 @@ stuff_buffered_input (stuffstring)
     }
 
   input_pending = 0;
-#endif
-#endif /* BSD_SYSTEM and not BSD4_1 */
+#endif /* SIGTSTP */
 }
 
 void
diff --git a/src/print.c b/src/print.c
index 0abd30b5ce0..5a0f7fe6220 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1284,6 +1284,11 @@ print_preprocess (obj)
   int loop_count = 0;
   Lisp_Object halftail;
 
+  /* Give up if we go so deep that print_object will get an error.  */
+  /* See similar code in print_object.  */
+  if (print_depth >= PRINT_CIRCLE)
+    return;
+
   /* Avoid infinite recursion for circular nested structure
      in the case where Vprint_circle is nil.  */
   if (NILP (Vprint_circle))
@@ -1294,11 +1299,6 @@ print_preprocess (obj)
       being_printed[print_depth] = obj;
     }
 
-  /* Give up if we go so deep that print_object will get an error.  */
-  /* See similar code in print_object.  */
-  if (print_depth >= PRINT_CIRCLE)
-    return;
-
   print_depth++;
   halftail = obj;
 
diff --git a/src/search.c b/src/search.c
index 169baf05d55..0375f353dd2 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2974,6 +2974,9 @@ syms_of_search ()
   last_thing_searched = Qnil;
   staticpro (&last_thing_searched);
 
+  saved_last_thing_searched = Qnil;
+  staticpro (&saved_last_thing_searched);
+
   defsubr (&Slooking_at);
   defsubr (&Sposix_looking_at);
   defsubr (&Sstring_match);
diff --git a/src/w32fns.c b/src/w32fns.c
index b12bd7be28b..d5ba6e9b078 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7735,14 +7735,14 @@ specified.  Ensure that file exists if MUSTMATCH is non-nil.  */)
   /* Create the dialog with PROMPT as title, using DIR as initial
      directory and using "*" as pattern.  */
   dir = Fexpand_file_name (dir, Qnil);
-  strncpy (init_dir, SDATA (dir), MAX_PATH);
+  strncpy (init_dir, SDATA (ENCODE_SYSTEM (dir)), MAX_PATH);
   init_dir[MAX_PATH] = '\0';
   unixtodos_filename (init_dir);
 
   if (STRINGP (default_filename))
     {
       char *file_name_only;
-      char *full_path_name = SDATA (default_filename);
+      char *full_path_name = SDATA (ENCODE_SYSTEM (default_filename));
 
       unixtodos_filename (full_path_name);
 
diff --git a/src/window.c b/src/window.c
index b470b705397..0e318b039a4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -672,7 +672,7 @@ coordinates_in_window (w, x, y)
 
   /* Outside any interesting column?  */
   if (*x < left_x || *x > right_x)
-    return ON_NOTHING;
+    return ON_VERTICAL_BORDER;
 
   lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);
   rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);
@@ -1801,7 +1801,7 @@ static Lisp_Object
 window_list_1 (window, minibuf, all_frames)
      Lisp_Object window, minibuf, all_frames;
 {
-  Lisp_Object tail, list;
+  Lisp_Object tail, list, rest;
 
   decode_next_window_args (&window, &minibuf, &all_frames);
   list = Qnil;
@@ -1810,7 +1810,17 @@ window_list_1 (window, minibuf, all_frames)
     if (candidate_window_p (XCAR (tail), window, minibuf, all_frames))
       list = Fcons (XCAR (tail), list);
 
-  return Fnreverse (list);
+  /* Rotate the list to start with WINDOW.  */
+  list = Fnreverse (list);
+  rest = Fmemq (window, list);
+  if (!NILP (rest) && !EQ (rest, list))
+    {
+      for (tail = list; XCDR (tail) != rest; tail = XCDR (tail))
+        ;
+      XSETCDR (tail, Qnil);
+      list = nconc2 (rest, list);
+    }
+  return list;
 }