/[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.558 by lh, Thu Nov 10 11:57:15 2005 UTC revision 1.559 by raeburn, Tue Dec 6 07:39:37 2005 UTC
# Line 2730  int Line 2730  int
2730  internal_delete_file (filename)  internal_delete_file (filename)
2731       Lisp_Object filename;       Lisp_Object filename;
2732  {  {
2733    return NILP (internal_condition_case_1 (Fdelete_file, filename,    Lisp_Object tem;
2734                                            Qt, internal_delete_file_1));    tem = internal_condition_case_1 (Fdelete_file, filename,
2735                                       Qt, internal_delete_file_1);
2736      return NILP (tem);
2737  }  }
2738    
2739  DEFUN ("rename-file", Frename_file, Srename_file, 2, 3,  DEFUN ("rename-file", Frename_file, Srename_file, 2, 3,
# Line 6234  DEFUN ("read-file-name-internal", Fread_ Line 6236  DEFUN ("read-file-name-internal", Fread_
6236  #endif  #endif
6237          {          {
6238            /* Must do it the hard (and slow) way.  */            /* Must do it the hard (and slow) way.  */
6239              Lisp_Object tem;
6240            GCPRO3 (all, comp, specdir);            GCPRO3 (all, comp, specdir);
6241            count = SPECPDL_INDEX ();            count = SPECPDL_INDEX ();
6242            record_unwind_protect (read_file_name_cleanup, current_buffer->directory);            record_unwind_protect (read_file_name_cleanup, current_buffer->directory);
6243            current_buffer->directory = realdir;            current_buffer->directory = realdir;
6244            for (comp = Qnil; CONSP (all); all = XCDR (all))            for (comp = Qnil; CONSP (all); all = XCDR (all))
6245              if (!NILP (call1 (Vread_file_name_predicate, XCAR (all))))              {
6246                comp = Fcons (XCAR (all), comp);                tem = call1 (Vread_file_name_predicate, XCAR (all));
6247                  if (!NILP (tem))
6248                    comp = Fcons (XCAR (all), comp);
6249                }
6250            unbind_to (count, Qnil);            unbind_to (count, Qnil);
6251            UNGCPRO;            UNGCPRO;
6252          }          }

Legend:
Removed from v.1.558  
changed lines
  Added in v.1.559

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