[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/dired.c
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/src/dired.c |
Date: |
Tue, 04 Feb 2003 09:03:23 -0500 |
Index: emacs/src/dired.c
diff -c emacs/src/dired.c:1.102 emacs/src/dired.c:1.103
*** emacs/src/dired.c:1.102 Sat Dec 21 12:56:16 2002
--- emacs/src/dired.c Tue Feb 4 09:03:12 2003
***************
*** 130,136 ****
return Qnil;
}
! /* Function shared by Fdirectory_files and Fdirectory_files_and_attributes.
When ATTRS is zero, return a list of directory filenames; when
non-zero, return a list of directory filenames and their attributes. */
--- 130,136 ----
return Qnil;
}
! /* Function shared by Fdirectory_files and Fdirectory_files_and_attributes.
When ATTRS is zero, return a list of directory filenames; when
non-zero, return a list of directory filenames and their attributes. */
***************
*** 187,193 ****
have to make sure it gets closed, and setting up an
unwind_protect to do so would be a pain. */
retry:
!
d = opendir (SDATA (dirfilename));
if (d == NULL)
report_file_error ("Opening directory", Fcons (directory, Qnil));
--- 187,193 ----
have to make sure it gets closed, and setting up an
unwind_protect to do so would be a pain. */
retry:
!
d = opendir (SDATA (dirfilename));
if (d == NULL)
report_file_error ("Opening directory", Fcons (directory, Qnil));
***************
*** 219,225 ****
if (dp == NULL && errno == EAGAIN)
continue;
#endif
!
if (dp == NULL)
break;
--- 219,225 ----
if (dp == NULL && errno == EAGAIN)
continue;
#endif
!
if (dp == NULL)
break;
***************
*** 233,239 ****
len = NAMLEN (dp);
name = finalname = make_unibyte_string (dp->d_name, len);
GCPRO2 (finalname, name);
!
/* Note: ENCODE_FILE can GC; it should protect its argument,
though. */
name = DECODE_FILE (name);
--- 233,239 ----
len = NAMLEN (dp);
name = finalname = make_unibyte_string (dp->d_name, len);
GCPRO2 (finalname, name);
!
/* Note: ENCODE_FILE can GC; it should protect its argument,
though. */
name = DECODE_FILE (name);
***************
*** 261,284 ****
fullname = make_uninit_multibyte_string (nbytes, nbytes);
bcopy (SDATA (directory), SDATA (fullname),
directory_nbytes);
!
if (needsep)
SSET (fullname, directory_nbytes, DIRECTORY_SEP);
!
bcopy (SDATA (name),
SDATA (fullname) + directory_nbytes + needsep,
len);
!
nchars = chars_in_text (SDATA (fullname), nbytes);
/* Some bug somewhere. */
if (nchars > nbytes)
abort ();
!
STRING_SET_CHARS (fullname, nchars);
if (nchars == nbytes)
STRING_SET_UNIBYTE (fullname);
!
finalname = fullname;
}
else
--- 261,284 ----
fullname = make_uninit_multibyte_string (nbytes, nbytes);
bcopy (SDATA (directory), SDATA (fullname),
directory_nbytes);
!
if (needsep)
SSET (fullname, directory_nbytes, DIRECTORY_SEP);
!
bcopy (SDATA (name),
SDATA (fullname) + directory_nbytes + needsep,
len);
!
nchars = chars_in_text (SDATA (fullname), nbytes);
/* Some bug somewhere. */
if (nchars > nbytes)
abort ();
!
STRING_SET_CHARS (fullname, nchars);
if (nchars == nbytes)
STRING_SET_UNIBYTE (fullname);
!
finalname = fullname;
}
else
***************
*** 328,334 ****
if (NILP (nosort))
list = Fsort (Fnreverse (list),
attrs ? Qfile_attributes_lessp : Qstring_lessp);
!
RETURN_UNGCPRO (list);
}
--- 328,334 ----
if (NILP (nosort))
list = Fsort (Fnreverse (list),
attrs ? Qfile_attributes_lessp : Qstring_lessp);
!
RETURN_UNGCPRO (list);
}
***************
*** 686,692 ****
/* This tests that the current file is an exact match
but BESTMATCH is not (it is too long). */
if ((matchsize == len
! && matchsize + !!directoryp
< SCHARS (bestmatch))
||
/* If there is no exact match ignoring case,
--- 686,692 ----
/* This tests that the current file is an exact match
but BESTMATCH is not (it is too long). */
if ((matchsize == len
! && matchsize + !!directoryp
< SCHARS (bestmatch))
||
/* If there is no exact match ignoring case,
***************
*** 699,705 ****
either both or neither are exact. */
(((matchsize == len)
==
! (matchsize + !!directoryp
== SCHARS (bestmatch)))
&& !bcmp (p2, SDATA (encoded_file), SCHARS
(encoded_file))
&& bcmp (p1, SDATA (encoded_file), SCHARS
(encoded_file))))
--- 699,705 ----
either both or neither are exact. */
(((matchsize == len)
==
! (matchsize + !!directoryp
== SCHARS (bestmatch)))
&& !bcmp (p2, SDATA (encoded_file), SCHARS
(encoded_file))
&& bcmp (p1, SDATA (encoded_file), SCHARS
(encoded_file))))
- [Emacs-diffs] Changes to emacs/src/dired.c,
Juanma Barranquero <=