aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2006-09-14 14:42:49 +0000
committerKim F. Storm2006-09-14 14:42:49 +0000
commitbf8b0f8b81c11974a287c0cc4a7cbd8b1cfcdb32 (patch)
tree4c55b7ceedc989f703a49351cc523ac0d3f88f90
parentcd3587c125d58310bc11bebf32541048eea11c0b (diff)
downloademacs-bf8b0f8b81c11974a287c0cc4a7cbd8b1cfcdb32.tar.gz
emacs-bf8b0f8b81c11974a287c0cc4a7cbd8b1cfcdb32.zip
(ido-ignore-item-p): Allow any kind of functions in ignore lists.
From Michaƫl Cadilhac.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ido.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62ada3773cc..e9415d745bd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-09-14 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org>
2
3 * ido.el (ido-ignore-item-p): Allow any kind of functions in
4 ignore lists.
5
12006-09-14 Kim F. Storm <storm@cua.dk> 62006-09-14 Kim F. Storm <storm@cua.dk>
2 7
3 * jit-lock.el (jit-lock-fontify-again): New function. 8 * jit-lock.el (jit-lock-fontify-again): New function.
diff --git a/lisp/ido.el b/lisp/ido.el
index e3baa71396b..432347717f5 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3618,7 +3618,7 @@ for first matching file."
3618 ((stringp nextstr) 3618 ((stringp nextstr)
3619 (and (>= flen (setq slen (length nextstr))) 3619 (and (>= flen (setq slen (length nextstr)))
3620 (string-equal (substring name (- flen slen)) nextstr))) 3620 (string-equal (substring name (- flen slen)) nextstr)))
3621 ((fboundp nextstr) (funcall nextstr name)) 3621 ((functionp nextstr) (funcall nextstr name))
3622 (t nil)) 3622 (t nil))
3623 (setq ignorep t 3623 (setq ignorep t
3624 ext-list nil 3624 ext-list nil
@@ -3628,7 +3628,7 @@ for first matching file."
3628 (setq nextstr (car re-list)) 3628 (setq nextstr (car re-list))
3629 (if (cond 3629 (if (cond
3630 ((stringp nextstr) (string-match nextstr name)) 3630 ((stringp nextstr) (string-match nextstr name))
3631 ((fboundp nextstr) (funcall nextstr name)) 3631 ((functionp nextstr) (funcall nextstr name))
3632 (t nil)) 3632 (t nil))
3633 (setq ignorep t 3633 (setq ignorep t
3634 re-list nil) 3634 re-list nil)