[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/minibuf.c
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] Changes to emacs/src/minibuf.c |
Date: |
Sun, 13 Jun 2004 18:24:23 -0400 |
Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.268 emacs/src/minibuf.c:1.269
*** emacs/src/minibuf.c:1.268 Sat Jun 5 16:52:14 2004
--- emacs/src/minibuf.c Sun Jun 13 22:20:55 2004
***************
*** 1285,1304 ****
XSETFASTINT (zero, 0);
/* Ignore this element if it fails to match all the regexps. */
! {
! int count = SPECPDL_INDEX ();
! specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
! for (regexps = Vcompletion_regexp_list; CONSP (regexps);
! regexps = XCDR (regexps))
! {
! tem = Fstring_match (XCAR (regexps), eltstring, zero);
! if (NILP (tem))
! break;
! }
! unbind_to (count, Qnil);
! if (CONSP (regexps))
! continue;
! }
/* Ignore this element if there is a predicate
and the predicate doesn't like it. */
--- 1285,1305 ----
XSETFASTINT (zero, 0);
/* Ignore this element if it fails to match all the regexps. */
! if (CONSP (Vcompletion_regexp_list))
! {
! int count = SPECPDL_INDEX ();
! specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
! for (regexps = Vcompletion_regexp_list; CONSP (regexps);
! regexps = XCDR (regexps))
! {
! tem = Fstring_match (XCAR (regexps), eltstring, zero);
! if (NILP (tem))
! break;
! }
! unbind_to (count, Qnil);
! if (CONSP (regexps))
! continue;
! }
/* Ignore this element if there is a predicate
and the predicate doesn't like it. */
***************
*** 1536,1555 ****
XSETFASTINT (zero, 0);
/* Ignore this element if it fails to match all the regexps. */
! {
! int count = SPECPDL_INDEX ();
! specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
! for (regexps = Vcompletion_regexp_list; CONSP (regexps);
! regexps = XCDR (regexps))
! {
! tem = Fstring_match (XCAR (regexps), eltstring, zero);
! if (NILP (tem))
! break;
! }
! unbind_to (count, Qnil);
! if (CONSP (regexps))
! continue;
! }
/* Ignore this element if there is a predicate
and the predicate doesn't like it. */
--- 1537,1557 ----
XSETFASTINT (zero, 0);
/* Ignore this element if it fails to match all the regexps. */
! if (CONSP (Vcompletion_regexp_list))
! {
! int count = SPECPDL_INDEX ();
! specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
! for (regexps = Vcompletion_regexp_list; CONSP (regexps);
! regexps = XCDR (regexps))
! {
! tem = Fstring_match (XCAR (regexps), eltstring, zero);
! if (NILP (tem))
! break;
! }
! unbind_to (count, Qnil);
! if (CONSP (regexps))
! continue;
! }
/* Ignore this element if there is a predicate
and the predicate doesn't like it. */
***************
*** 1784,1802 ****
return call3 (alist, string, predicate, Qlambda);
/* Reject this element if it fails to match all the regexps. */
! {
! int count = SPECPDL_INDEX ();
! specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
! for (regexps = Vcompletion_regexp_list; CONSP (regexps);
! regexps = XCDR (regexps))
! {
! if (NILP (Fstring_match (XCAR (regexps),
! SYMBOLP (tem) ? string : tem,
! Qnil)))
! return unbind_to (count, Qnil);
! }
! unbind_to (count, Qnil);
! }
/* Finally, check the predicate. */
if (!NILP (predicate))
--- 1786,1805 ----
return call3 (alist, string, predicate, Qlambda);
/* Reject this element if it fails to match all the regexps. */
! if (CONSP (Vcompletion_regexp_list))
! {
! int count = SPECPDL_INDEX ();
! specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
! for (regexps = Vcompletion_regexp_list; CONSP (regexps);
! regexps = XCDR (regexps))
! {
! if (NILP (Fstring_match (XCAR (regexps),
! SYMBOLP (tem) ? string : tem,
! Qnil)))
! return unbind_to (count, Qnil);
! }
! unbind_to (count, Qnil);
! }
/* Finally, check the predicate. */
if (!NILP (predicate))