Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-257
   {arch}/=cvs-sync-make-log: Use new features of tla-changelogs-to-log


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

5 files changed, 108 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4db9b8cb4d9..c3314cb98e5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2004-04-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (x_produce_glyphs): Fix the proverbial int/Lisp_Object mixup.
+        (on_hot_spot_p): Make sure we always return a value.
+        (Flookup_image_map): Remove unused var ix and iy.
+        (note_mode_line_or_margin_highlight): Remove unused var `image'.
+
+2004-04-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (init_environment): If one of the TMP... environment
+        variables is set to a drive letter without a trailing slash,
+        append a slash.
+
+2004-04-27  Matthew Mundell  <matt@mundell.ukfsn.org>
+
+        * editfns.c (lisp_time_argument): Provide externally.
+
+        * fileio.c (Fset_file_times): New function.
+        (syms_of_fileio): Intern and staticpro it.
+
 2004-04-27  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (x_produce_glyphs): Fix last change; handle newline in
diff --git a/src/editfns.c b/src/editfns.c
index a5c3aea14bc..51187c0e473 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -73,7 +73,7 @@ static int tm_diff P_ ((struct tm *, struct tm *));
 static void find_field P_ ((Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *));
 static void update_buffer_properties P_ ((int, int));
 static Lisp_Object region_limit P_ ((int));
-static int lisp_time_argument P_ ((Lisp_Object, time_t *, int *));
+int lisp_time_argument P_ ((Lisp_Object, time_t *, int *));
 static size_t emacs_memftimeu P_ ((char *, size_t, const char *,
                                    size_t, const struct tm *, int));
 static void general_insert_function P_ ((void (*) (const unsigned char *, int),
@@ -1377,7 +1377,7 @@ resolution finer than a second.  */)
 }
 
 
-static int
+int
 lisp_time_argument (specified_time, result, usec)
      Lisp_Object specified_time;
      time_t *result;
diff --git a/src/fileio.c b/src/fileio.c
index 38b2cbd5b52..db1aac0afda 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -325,6 +325,7 @@ Lisp_Object Qfile_regular_p;
 Lisp_Object Qfile_accessible_directory_p;
 Lisp_Object Qfile_modes;
 Lisp_Object Qset_file_modes;
+Lisp_Object Qset_file_times;
 Lisp_Object Qfile_newer_than_file_p;
 Lisp_Object Qinsert_file_contents;
 Lisp_Object Qwrite_region;
@@ -3440,7 +3441,59 @@ The value is an integer.  */)
   XSETINT (value, (~ realmask) & 0777);
   return value;
 }
+
+extern int lisp_time_argument P_ ((Lisp_Object, time_t *, int *));
+
+DEFUN ("set-file-times", Fset_file_times, Sset_file_times, 1, 2, 0,
+       doc: /* Set times of file FILENAME to TIME.
+Set both access and modification times.
+Return t on success, else nil.
+Use the current time if TIME is nil.  TIME is in the format of
+`current-time'. */)
+  (filename, time)
+     Lisp_Object filename, time;
+{
+  Lisp_Object absname, encoded_absname;
+  Lisp_Object handler;
+  time_t sec;
+  int usec;
+
+  if (! lisp_time_argument (time, &sec, &usec))
+    error ("Invalid time specification");
+
+  absname = Fexpand_file_name (filename, current_buffer->directory);
+
+  /* If the file name has special constructs in it,
+     call the corresponding file handler.  */
+  handler = Ffind_file_name_handler (absname, Qset_file_times);
+  if (!NILP (handler))
+    return call3 (handler, Qset_file_times, absname, time);
+
+  encoded_absname = ENCODE_FILE (absname);
 
+  {
+    EMACS_TIME t;
+
+    EMACS_SET_SECS (t, sec);
+    EMACS_SET_USECS (t, usec);
+
+    if (set_file_times (SDATA (encoded_absname), t, t))
+      {
+#ifdef DOS_NT
+        struct stat st;
+
+        /* Setting times on a directory always fails.  */
+        if (stat (SDATA (encoded_absname), &st) == 0
+            && (st.st_mode & S_IFMT) == S_IFDIR)
+          return Qnil;
+#endif
+        report_file_error ("Setting file times", Fcons (absname, Qnil));
+        return Qnil;
+      }
+  }
+
+  return Qt;
+}
 
 #ifdef __NetBSD__
 #define unix 42
@@ -6344,6 +6397,7 @@ syms_of_fileio ()
   Qfile_accessible_directory_p = intern ("file-accessible-directory-p");
   Qfile_modes = intern ("file-modes");
   Qset_file_modes = intern ("set-file-modes");
+  Qset_file_times = intern ("set-file-times");
   Qfile_newer_than_file_p = intern ("file-newer-than-file-p");
   Qinsert_file_contents = intern ("insert-file-contents");
   Qwrite_region = intern ("write-region");
@@ -6377,6 +6431,7 @@ syms_of_fileio ()
   staticpro (&Qfile_accessible_directory_p);
   staticpro (&Qfile_modes);
   staticpro (&Qset_file_modes);
+  staticpro (&Qset_file_times);
   staticpro (&Qfile_newer_than_file_p);
   staticpro (&Qinsert_file_contents);
   staticpro (&Qwrite_region);
@@ -6600,6 +6655,7 @@ a non-nil value.  */);
   defsubr (&Sfile_regular_p);
   defsubr (&Sfile_modes);
   defsubr (&Sset_file_modes);
+  defsubr (&Sset_file_times);
   defsubr (&Sset_default_file_modes);
   defsubr (&Sdefault_file_modes);
   defsubr (&Sfile_newer_than_file_p);
diff --git a/src/msdos.c b/src/msdos.c
index 39d28564890..b30e51bbb36 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -4408,9 +4408,28 @@ init_environment (argc, argv, skip_args)
   for (i = 0; i < imax ; i++)
     {
       const char *tmp = tempdirs[i];
+      char buf[FILENAME_MAX];
 
       if (*tmp == '$')
-        tmp = getenv (tmp + 1);
+        {
+          int tmp_len;
+
+          tmp = getenv (tmp + 1);
+          if (!tmp)
+            continue;
+
+          /* Some lusers set TMPDIR=e:, probably because some losing
+             programs cannot handle multiple slashes if they use e:/.
+             e: fails in `access' below, so we interpret e: as e:/.  */
+          tmp_len = strlen(tmp);
+          if (tmp[tmp_len - 1] != '/' && tmp[tmp_len - 1] != '\\')
+            {
+              strcpy(buf, tmp);
+              buf[tmp_len++] = '/', buf[tmp_len] = 0;
+              tmp = buf;
+            }
+        }
+
       /* Note that `access' can lie to us if the directory resides on a
          read-only filesystem, like CD-ROM or a write-protected floppy.
          The only way to be really sure is to actually create a file and
diff --git a/src/xdisp.c b/src/xdisp.c
index d5e12e68546..e77fa98cab1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18707,7 +18707,8 @@ x_produce_glyphs (it)
           it->pixel_width = 0;
           it->nglyphs = 0;
 
-          lh = Fget_text_property (IT_CHARPOS (*it), Qline_height, it->object);
+          lh = Fget_text_property (make_number (IT_CHARPOS (*it)),
+                                   Qline_height, it->object);
 
           if (EQ (lh, Qt))
             {
@@ -18753,17 +18754,20 @@ x_produce_glyphs (it)
               if (INTEGERP (lh))
                 explicit_height = XINT (lh);
               else if (FLOATP (lh))
-                explicit_height = (it->phys_ascent + it->phys_descent) * XFLOAT_DATA (lh);
+                explicit_height = (it->phys_ascent + it->phys_descent)
+                  * XFLOAT_DATA (lh);
 
               if (explicit_height > it->ascent + it->descent)
                 it->ascent = explicit_height - it->descent;
             }
 
-          lsp = Fget_text_property (IT_CHARPOS (*it), Qline_spacing, it->object);
+          lsp = Fget_text_property (make_number (IT_CHARPOS (*it)),
+                                    Qline_spacing, it->object);
           if (INTEGERP (lsp))
             extra_line_spacing = XINT (lsp);
           else if (FLOATP (lsp))
-            extra_line_spacing = (it->phys_ascent + it->phys_descent) * XFLOAT_DATA (lsp);
+            extra_line_spacing = (it->phys_ascent + it->phys_descent)
+              * XFLOAT_DATA (lsp);
         }
       else if (it->char_to_display == '\t')
         {
@@ -21342,8 +21346,8 @@ phys_cursor_in_rect_p (w, r)
          I assume the effect is the same -- and this is portable.  */
       return x_intersect_rectangles (&cr, r, &result);
     }
-  else
-    return 0;
+  /* If we don't understand the format, pretend we're not in the hot-spot.  */
+  return 0;
 }