Mercurial > emacs
comparison src/dired.c @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 21 Mar 2007 13:33:07 +0000 |
| parents | 95d0cdf160ea 9d80f63e45cf |
| children | f55f9811f5d7 |
comparison
equal
deleted
inserted
replaced
| 90788:a12805fdabe8 | 90789:c0409ee15cee |
|---|---|
| 669 /* Test the predicate, if any. */ | 669 /* Test the predicate, if any. */ |
| 670 | 670 |
| 671 if (!NILP (predicate)) | 671 if (!NILP (predicate)) |
| 672 { | 672 { |
| 673 Lisp_Object decoded; | 673 Lisp_Object decoded; |
| 674 Lisp_Object val; | |
| 675 struct gcpro gcpro1; | |
| 676 | |
| 677 GCPRO1 (name); | |
| 674 decoded = Fexpand_file_name (DECODE_FILE (name), dirname); | 678 decoded = Fexpand_file_name (DECODE_FILE (name), dirname); |
| 675 if (NILP (call1 (predicate, decoded))) | 679 val = call1 (predicate, decoded); |
| 680 UNGCPRO; | |
| 681 | |
| 682 if (NILP (val)) | |
| 676 continue; | 683 continue; |
| 677 } | 684 } |
| 678 | 685 |
| 679 /* Suitably record this match. */ | 686 /* Suitably record this match. */ |
| 680 | 687 |
| 693 else | 700 else |
| 694 { | 701 { |
| 695 compare = min (bestmatchsize, len); | 702 compare = min (bestmatchsize, len); |
| 696 p1 = SDATA (bestmatch); | 703 p1 = SDATA (bestmatch); |
| 697 p2 = (unsigned char *) dp->d_name; | 704 p2 = (unsigned char *) dp->d_name; |
| 698 matchsize = scmp(p1, p2, compare); | 705 matchsize = scmp (p1, p2, compare); |
| 699 if (matchsize < 0) | 706 if (matchsize < 0) |
| 700 matchsize = compare; | 707 matchsize = compare; |
| 701 if (completion_ignore_case) | 708 if (completion_ignore_case) |
| 702 { | 709 { |
| 703 /* If this is an exact match except for case, | 710 /* If this is an exact match except for case, |