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

[Colin Walters]

Index: emacs/lisp/ibuffer.el
diff -c emacs/lisp/ibuffer.el:1.15 emacs/lisp/ibuffer.el:1.16
*** emacs/lisp/ibuffer.el:1.15  Fri Mar 29 17:54:40 2002
--- emacs/lisp/ibuffer.el       Wed Apr 10 15:11:45 2002
***************
*** 1679,1697 ****
             (push (cons buf mark) ibuffer-current-state-list-tmp)))))
      (nreverse ibuffer-current-state-list-tmp)))
  
! (defsubst ibuffer-canonicalize-state-list (bmarklist)
!   "Order BMARKLIST in the same way as the current buffer list."
!   (delq nil
!       (mapcar #'(lambda (buf) (assq buf bmarklist)) (buffer-list))))
! 
! (defun ibuffer-current-buffers-with-marks ()
    "Return a list like (BUF . MARK) of all open buffers."
    (let ((bufs (ibuffer-current-state-list)))
      (mapcar #'(lambda (buf) (let ((e (assq buf bufs)))
                              (if e
                                  e
                                (cons buf ? ))))
!           (buffer-list))))
  
  (defun ibuffer-buf-matches-predicates (buf predicates)
    (let ((hit nil)
--- 1679,1692 ----
             (push (cons buf mark) ibuffer-current-state-list-tmp)))))
      (nreverse ibuffer-current-state-list-tmp)))
  
! (defun ibuffer-current-buffers-with-marks (bufs)
    "Return a list like (BUF . MARK) of all open buffers."
    (let ((bufs (ibuffer-current-state-list)))
      (mapcar #'(lambda (buf) (let ((e (assq buf bufs)))
                              (if e
                                  e
                                (cons buf ? ))))
!           bufs)))
  
  (defun ibuffer-buf-matches-predicates (buf predicates)
    (let ((hit nil)
***************
*** 1905,1911 ****
                                   (buffer-name (cadr bufs))))
                    (caddr bufs)
                  (cadr bufs))
!               (ibuffer-current-buffers-with-marks)
                arg)))
      (when (null blist)
        (if (and (featurep 'ibuf-ext)
--- 1900,1906 ----
                                   (buffer-name (cadr bufs))))
                    (caddr bufs)
                  (cadr bufs))
!               (ibuffer-current-buffers-with-marks bufs)
                arg)))
      (when (null blist)
        (if (and (featurep 'ibuf-ext)
***************
*** 2048,2053 ****
--- 2043,2049 ----
                (message "Commands: m, u, t, RET, g, k, S, D, Q; q to quit; h 
for help")))
          (select-window owin))))))
  
+ (put 'ibuffer-mode 'mode-class 'special)
  (defun ibuffer-mode ()
    "A major mode for viewing a list of buffers.
  In ibuffer, you can conveniently perform many operations on the