[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.18 emacs/lisp/ibuf-ext.el:1.19
*** emacs/lisp/ibuf-ext.el:1.18 Sun Apr 28 17:40:57 2002
--- emacs/lisp/ibuf-ext.el      Mon Apr 29 19:12:29 2002
***************
*** 610,616 ****
        (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))
  
--- 610,616 ----
        (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))
  
***************
*** 623,629 ****
        (progn
        (when (equal it "Default")
          (error "Can't kill default filtering group"))
!       (push (assoc it ibuffer-filter-groups) ibuffer-filter-group-kill-ring)
        (ibuffer-kill-filter-group it))
        (funcall (if (interactive-p) #'call-interactively #'funcall)
               #'kill-line arg)))
--- 623,630 ----
        (progn
        (when (equal it "Default")
          (error "Can't kill default filtering group"))
!       (push (copy-tree (assoc it ibuffer-filter-groups))
!             ibuffer-filter-group-kill-ring)
        (ibuffer-kill-filter-group it))
        (funcall (if (interactive-p) #'call-interactively #'funcall)
               #'kill-line arg)))
***************
*** 641,650 ****
                    (get-text-property (point) 'ibuffer-filter-group)
                    (last all-groups)))
           (pos (or (position cur (mapcar #'car all-groups) :test #'equal)
!                   (1- (length all-groups)))))
        (cond ((= pos 0)
             (push last-killed ibuffer-filter-groups))
!           ((= pos (1- (length all-groups)))
             (setq ibuffer-filter-groups
                   (nconc ibuffer-filter-groups (list last-killed))))
            (t
--- 642,651 ----
                    (get-text-property (point) 'ibuffer-filter-group)
                    (last all-groups)))
           (pos (or (position cur (mapcar #'car all-groups) :test #'equal)
!                   (length all-groups))))
        (cond ((= pos 0)
             (push last-killed ibuffer-filter-groups))
!           ((= pos (length all-groups))
             (setq ibuffer-filter-groups
                   (nconc ibuffer-filter-groups (list last-killed))))
            (t
***************
*** 677,684 ****
    (interactive
     (list
      (if (null ibuffer-saved-filter-groups)
!       (error "No saved filters")
!       (completing-read "Delete saved filters: "
                       ibuffer-saved-filter-groups nil t))))
    (setq ibuffer-saved-filter-groups
        (ibuffer-delete-alist name ibuffer-saved-filter-groups))
--- 678,685 ----
    (interactive
     (list
      (if (null ibuffer-saved-filter-groups)
!       (error "No saved filter groups")
!       (completing-read "Delete saved filter group: "
                       ibuffer-saved-filter-groups nil t))))
    (setq ibuffer-saved-filter-groups
        (ibuffer-delete-alist name ibuffer-saved-filter-groups))