[Emacs-diffs] Changes to emacs/lisp/iswitchb.el

[Eli Zaretskii]

Index: emacs/lisp/iswitchb.el
diff -c emacs/lisp/iswitchb.el:1.55 emacs/lisp/iswitchb.el:1.56
*** emacs/lisp/iswitchb.el:1.55 Sun Aug 22 10:58:16 2004
--- emacs/lisp/iswitchb.el      Sat Jun  4 18:50:38 2005
***************
*** 889,910 ****
           (do-string         (stringp (car list)))
           name
           ret)
!     (mapcar
!      (lambda (x)
! 
!        (if do-string
!          (setq name x)               ;We already have the name
!        (setq name (buffer-name x)))
! 
!        (cond
!       ((and (or (and string-format (string-match regexp name))
!                 (and (null string-format)
!                      (string-match (regexp-quote regexp) name)))
! 
!             (not (iswitchb-ignore-buffername-p name)))
!        (setq ret (cons name ret))
!           )))
!      list)
      ret))
  
  (defun iswitchb-ignore-buffername-p (bufname)
--- 889,915 ----
           (do-string         (stringp (car list)))
           name
           ret)
!     (catch 'invalid-regexp
!       (mapcar
!        (lambda (x)
! 
!        (if do-string
!            (setq name x)              ;We already have the name
!          (setq name (buffer-name x)))
! 
!        (cond
!         ((and (or (and string-format
!                        (condition-case error
!                            (string-match regexp name)
!                          (invalid-regexp
!                             (throw 'invalid-regexp (setq ret (cdr error))))))
!                   (and (null string-format)
!                        (string-match (regexp-quote regexp) name)))
! 
!               (not (iswitchb-ignore-buffername-p name)))
!          (setq ret (cons name ret))
!          )))
!        list))
      ret))
  
  (defun iswitchb-ignore-buffername-p (bufname)