/[emacs]/emacs/src/fileio.c
ViewVC logotype

Diff of /emacs/src/fileio.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.454 by raeburn, Mon Jul 15 00:00:36 2002 UTC revision 1.455 by raeburn, Tue Jul 16 15:49:16 2002 UTC
# Line 270  report_file_error (string, data) Line 270  report_file_error (string, data)
270          /* System error messages are capitalized.  Downcase the initial          /* System error messages are capitalized.  Downcase the initial
271             unless it is followed by a slash.  */             unless it is followed by a slash.  */
272          if (SREF (errstring, 1) != '/')          if (SREF (errstring, 1) != '/')
273            SREF (errstring, 0) = DOWNCASE (SREF (errstring, 0));            SSET (errstring, 0, DOWNCASE (SREF (errstring, 0)));
274    
275          Fsignal (Qfile_error,          Fsignal (Qfile_error,
276                   Fcons (build_string (string), Fcons (errstring, data)));                   Fcons (build_string (string), Fcons (errstring, data)));
# Line 1301  See also the function `substitute-in-fil Line 1301  See also the function `substitute-in-fil
1301            if (strcmp (nm - 2, SDATA (name)) != 0)            if (strcmp (nm - 2, SDATA (name)) != 0)
1302              {              {
1303                name = make_string (nm - 2, p - nm + 2);                name = make_string (nm - 2, p - nm + 2);
1304                SREF (name, 0) = DRIVE_LETTER (drive);                SSET (name, 0, DRIVE_LETTER (drive));
1305                SREF (name, 1) = ':';                SSET (name, 1, ':');
1306              }              }
1307            return name;            return name;
1308  #else /* not DOS_NT */  #else /* not DOS_NT */
# Line 6015  provides a file dialog box.  */) Line 6015  provides a file dialog box.  */)
6015    if (homedir != 0    if (homedir != 0
6016        && STRINGP (dir)        && STRINGP (dir)
6017        && !strncmp (homedir, SDATA (dir), strlen (homedir))        && !strncmp (homedir, SDATA (dir), strlen (homedir))
6018        && IS_DIRECTORY_SEP (SDATA (dir)[strlen (homedir)]))        && IS_DIRECTORY_SEP (SREF (dir, strlen (homedir))))
6019      {      {
6020        dir = make_string (SDATA (dir) + strlen (homedir) - 1,        dir = make_string (SDATA (dir) + strlen (homedir) - 1,
6021                           SBYTES (dir) - strlen (homedir) + 1);                           SBYTES (dir) - strlen (homedir) + 1);
6022        SREF (dir, 0) = '~';        SSET (dir, 0, '~');
6023      }      }
6024    /* Likewise for default_filename.  */    /* Likewise for default_filename.  */
6025    if (homedir != 0    if (homedir != 0
6026        && STRINGP (default_filename)        && STRINGP (default_filename)
6027        && !strncmp (homedir, SDATA (default_filename), strlen (homedir))        && !strncmp (homedir, SDATA (default_filename), strlen (homedir))
6028        && IS_DIRECTORY_SEP (SDATA (default_filename)[strlen (homedir)]))        && IS_DIRECTORY_SEP (SREF (default_filename, strlen (homedir))))
6029      {      {
6030        default_filename        default_filename
6031          = make_string (SDATA (default_filename) + strlen (homedir) - 1,          = make_string (SDATA (default_filename) + strlen (homedir) - 1,
6032                         SBYTES (default_filename) - strlen (homedir) + 1);                         SBYTES (default_filename) - strlen (homedir) + 1);
6033        SREF (default_filename, 0) = '~';        SSET (default_filename, 0, '~');
6034      }      }
6035    if (!NILP (default_filename))    if (!NILP (default_filename))
6036      {      {

Legend:
Removed from v.1.454  
changed lines
  Added in v.1.455

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26