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

[Colin Walters]

Index: emacs/lisp/ibuf-ext.el
diff -c emacs/lisp/ibuf-ext.el:1.17 emacs/lisp/ibuf-ext.el:1.18
*** emacs/lisp/ibuf-ext.el:1.17 Thu Apr 25 23:59:35 2002
--- emacs/lisp/ibuf-ext.el      Sun Apr 28 17:40:57 2002
***************
*** 541,551 ****
    "Set the current filter groups to filter by mode."
    (interactive)
    (setq ibuffer-filter-groups
!       (mapcar (lambda (mode)
!                 (cons (format "%s" mode) `((mode . ,mode))))
!               (delete-duplicates
!                (mapcar (lambda (buf) (with-current-buffer buf major-mode))
!                        (buffer-list)))))
    (ibuffer-update nil t))
  
  ;;;###autoload
--- 541,555 ----
    "Set the current filter groups to filter by mode."
    (interactive)
    (setq ibuffer-filter-groups
!         (mapcar (lambda (mode)
!                   (cons (format "%s" mode) `((mode . ,mode))))
!                 (let ((modes
!                        (delete-duplicates
!                         (mapcar (lambda (buf) (with-current-buffer buf 
major-mode))
!                                 (buffer-list)))))
!                   (if ibuffer-view-ibuffer
!                     modes
!                   (delq 'ibuffer-mode modes)))))
    (ibuffer-update nil t))
  
  ;;;###autoload
***************
*** 554,567 ****
    (interactive)
    (when (null ibuffer-filter-groups)
      (error "No filtering groups active"))
!   (pop ibuffer-filter-groups)
    (ibuffer-update nil t))
  
  ;;;###autoload
  (defun ibuffer-clear-filter-groups ()
    "Remove all filtering groups."
    (interactive)
!   (setq ibuffer-filter-groups nil)
    (ibuffer-update nil t))
  
  (defun ibuffer-current-filter-groups-with-position ()
--- 558,574 ----
    (interactive)
    (when (null ibuffer-filter-groups)
      (error "No filtering groups active"))
!   (setq ibuffer-hidden-filter-groups
!       (delete (pop ibuffer-filter-groups)
!               ibuffer-hidden-filter-groups))
    (ibuffer-update nil t))
  
  ;;;###autoload
  (defun ibuffer-clear-filter-groups ()
    "Remove all filtering groups."
    (interactive)
!   (setq ibuffer-filter-groups nil
!       ibuffer-hidden-filter-groups nil)
    (ibuffer-update nil t))
  
  (defun ibuffer-current-filter-groups-with-position ()
***************
*** 599,606 ****
      (setq name (completing-read "Kill filter group: "
                                ibuffer-filter-groups nil t)))
    (ibuffer-aif (assoc name ibuffer-filter-groups)
!       (setq ibuffer-filter-groups (ibuffer-delete-alist
!                                  name ibuffer-filter-groups))
      (error "No filter group with name \"%s\"" name))
    (ibuffer-update nil t))
  
--- 606,616 ----
      (setq name (completing-read "Kill filter group: "
                                ibuffer-filter-groups nil t)))
    (ibuffer-aif (assoc name ibuffer-filter-groups)
!       (progn
!       (setq ibuffer-filter-groups (ibuffer-delete-alist
!                                    name ibuffer-filter-groups))
!       (setq ibuffer-hidden-filter-groups
!             delete name ibuffer-hidden-filter-groups))
      (error "No filter group with name \"%s\"" name))
    (ibuffer-update nil t))
  
***************
*** 687,693 ****
        (error "No saved filters")
        (completing-read "Switch to saved filter group: "
                       ibuffer-saved-filter-groups nil t))))
!   (setq ibuffer-filter-groups (cdr (assoc name ibuffer-saved-filter-groups)))
    (ibuffer-update nil t))
  
  ;;;###autoload
--- 697,704 ----
        (error "No saved filters")
        (completing-read "Switch to saved filter group: "
                       ibuffer-saved-filter-groups nil t))))
!   (setq ibuffer-filter-groups (cdr (assoc name ibuffer-saved-filter-groups))
!       ibuffer-hidden-filter-groups nil)
    (ibuffer-update nil t))
  
  ;;;###autoload