Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-24

Merge from lorentey@elte.hu--2004/emacs--hacks--0, emacs--cvs-trunk--0

Patches applied:

 * lorentey@elte.hu--2004/emacs--hacks--0--patch-2
   Prevent special events from appending dashes to the echo string.

 * lorentey@elte.hu--2004/emacs--hacks--0--patch-4
   Added ChangeLog entry.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-451
   Update from CVS: lisp/subr.el (get-buffer-window-list): Doc fix.

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-455
   Bash the dashes

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

6 files changed, 53 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3d70d69cd69..1dfaa3f9ce4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,28 @@
+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
+        if GC_MARK_STACK.
+
 2004-07-10  Luc Teirlinck  <teirllm@auburn.edu>
 
         * buffer.c (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
diff --git a/src/alloc.c b/src/alloc.c
index 994dc21079f..0e3e78bbac2 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4990,6 +4990,7 @@ mark_object (arg)
           break;
 
         case Lisp_Misc_Save_Value:
+#if GC_MARK_STACK
           {
             register struct Lisp_Save_Value *ptr = XSAVE_VALUE (obj);
             /* If DOGC is set, POINTER is the address of a memory
@@ -5002,6 +5003,7 @@ mark_object (arg)
                   mark_maybe_object (*p);
               }
           }
+#endif
           break;
 
         case Lisp_Misc_Overlay:
diff --git a/src/fileio.c b/src/fileio.c
index a032a179ee1..bbc7d86c429 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5541,13 +5541,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/keyboard.c b/src/keyboard.c
index 382f99058d4..eb8c0c43fe6 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -802,6 +802,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,
diff --git a/src/search.c b/src/search.c
index 11ff90df014..a00490fd4b3 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2928,6 +2928,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 d3342f3ad6a..5dfdab1390c 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7798,14 +7798,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);