(file_p): Rename arg `path' to `filename'.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a46775ed5c61e2b0e27d99590997595873e5c44..1db79cfc82c5f1d696b24d336a058fe40fe4b9fa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,30 @@
+2002-03-03  Richard M. Stallman  <rms@gnu.org>
+
+       * xrdb.c (file_p): Rename arg `path' to `filename'.
+
+       * abbrev.c (Fexpand_abbrev): Increment plist as use count
+       only if it is an integer.
+
+       * xfns.c (png_load): Set screen_gamma based on f->gamma.
+       If png_get_sRGB gives an answer, call png_set_gamma
+       using the default image gamma value.
+
+       * lread.c (read1): When reading from a file, default string to
+       multibyte only if it has some multibyte characters.
+
+       * print.c (print_object): Output multibyte chars 128...255
+       using \x even if ! print_escape_multibyte.
+
+       * xdisp.c (display_mode_element): Move the places where
+       bytepos, charpos, this, and lisp_string are set.
+       Use lisp_string to set bytepos.
+
+       * xdisp.c (redisplay_internal):
+       Call clear_image_cache only if HAVE_WINDOW_SYSTEM.
+
+       * xdisp.c (display_mode_element): Merge properties specified with
+       :propertize onto those that come with the string.
+
 2002-03-03  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * xdisp.c (syms_of_xdisp) <auto-hscroll-mode>: Renamed from

diff --git a/src/xrdb.c b/src/xrdb.c
index e51a774dc477d01764ba660396ad905ba8c2d808..87c8f4b285d09e7339f33f98370f44f8cbf666ee 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -323,13 +323,13 @@ gethomedir ()
 
 
 static int
-file_p (path)
-     char *path;
+file_p (filename)
+     char *filename;
 {
   struct stat status;
 
-  return (access (path, 4) == 0                        /* exists and is readable */
-         && stat (path, &status) == 0          /* get the status */
+  return (access (filename, 4) == 0             /* exists and is readable */
+         && stat (filename, &status) == 0      /* get the status */
          && (S_ISDIR (status.st_mode)) == 0);  /* not a directory */
 }