Mercurial > emacs
diff src/fileio.c @ 46424:9aa6b2db42da
* fileio.c (Fmake_symbolic_link, Fexpand_file_name): Use SSET.
(Fread_file_name): Use SREF, SSET.
| author | Ken Raeburn <raeburn@raeburn.org> |
|---|---|
| date | Tue, 16 Jul 2002 15:49:16 +0000 |
| parents | 40db0673e6f0 |
| children | 5c56d4068a01 |
line wrap: on
line diff
--- a/src/fileio.c Tue Jul 16 15:49:12 2002 +0000 +++ b/src/fileio.c Tue Jul 16 15:49:16 2002 +0000 @@ -270,7 +270,7 @@ /* System error messages are capitalized. Downcase the initial unless it is followed by a slash. */ if (SREF (errstring, 1) != '/') - SREF (errstring, 0) = DOWNCASE (SREF (errstring, 0)); + SSET (errstring, 0, DOWNCASE (SREF (errstring, 0))); Fsignal (Qfile_error, Fcons (build_string (string), Fcons (errstring, data))); @@ -1301,8 +1301,8 @@ if (strcmp (nm - 2, SDATA (name)) != 0) { name = make_string (nm - 2, p - nm + 2); - SREF (name, 0) = DRIVE_LETTER (drive); - SREF (name, 1) = ':'; + SSET (name, 0, DRIVE_LETTER (drive)); + SSET (name, 1, ':'); } return name; #else /* not DOS_NT */ @@ -6015,22 +6015,22 @@ if (homedir != 0 && STRINGP (dir) && !strncmp (homedir, SDATA (dir), strlen (homedir)) - && IS_DIRECTORY_SEP (SDATA (dir)[strlen (homedir)])) + && IS_DIRECTORY_SEP (SREF (dir, strlen (homedir)))) { dir = make_string (SDATA (dir) + strlen (homedir) - 1, SBYTES (dir) - strlen (homedir) + 1); - SREF (dir, 0) = '~'; + SSET (dir, 0, '~'); } /* Likewise for default_filename. */ if (homedir != 0 && STRINGP (default_filename) && !strncmp (homedir, SDATA (default_filename), strlen (homedir)) - && IS_DIRECTORY_SEP (SDATA (default_filename)[strlen (homedir)])) + && IS_DIRECTORY_SEP (SREF (default_filename, strlen (homedir)))) { default_filename = make_string (SDATA (default_filename) + strlen (homedir) - 1, SBYTES (default_filename) - strlen (homedir) + 1); - SREF (default_filename, 0) = '~'; + SSET (default_filename, 0, '~'); } if (!NILP (default_filename)) {
