[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.20 emacs/lisp/ibuf-ext.el:1.21
*** emacs/lisp/ibuf-ext.el:1.20 Sat May  4 20:12:17 2002
--- emacs/lisp/ibuf-ext.el      Tue May  7 04:13:13 2002
***************
*** 554,571 ****
  
  ;;;###autoload
  (defun ibuffer-pop-filter-group ()
!   "Remove the first filtering group."
    (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)
--- 554,590 ----
  
  ;;;###autoload
  (defun ibuffer-pop-filter-group ()
!   "Remove the first filter group."
    (interactive)
    (when (null ibuffer-filter-groups)
!     (error "No filter groups active"))
    (setq ibuffer-hidden-filter-groups
        (delete (pop ibuffer-filter-groups)
                ibuffer-hidden-filter-groups))
    (ibuffer-update nil t))
  
+ (defun ibuffer-read-filter-group-name (msg &optional nodefault noerror)
+   (when (and (not noerror) (null ibuffer-filter-groups))
+     (error "No filter groups active"))
+   (let ((groups (mapcar #'car ibuffer-filter-groups)))
+     (completing-read msg (if nodefault
+                            groups
+                          (cons "Default" groups))
+                    nil t)))
+ 
+ ;;;###autoload
+ (defun ibuffer-decompose-filter-group (group)
+   "Decompose the filter group GROUP into active filters."
+   (interactive (list (ibuffer-read-filter-group-name "Decompose filter group: 
" t)))
+   (let ((data (cdr (assoc group ibuffer-filter-groups))))
+     (setq ibuffer-filter-groups (ibuffer-delete-alist
+                                group ibuffer-filter-groups)
+         ibuffer-filtering-qualifiers data))
+   (ibuffer-update nil t))
+ 
  ;;;###autoload
  (defun ibuffer-clear-filter-groups ()
!   "Remove all filter groups."
    (interactive)
    (setq ibuffer-filter-groups nil
        ibuffer-hidden-filter-groups nil)
***************
*** 590,613 ****
  ;;;###autoload
  (defun ibuffer-jump-to-filter-group (name)
    "Move point to the filter group whose name is NAME."
!   (interactive (list nil))
!   (let ((table (ibuffer-current-filter-groups-with-position)))
!     (when (interactive-p)
!       (setq name (completing-read "Jump to filter group: " table nil t)))
!     (ibuffer-aif (assoc name table)
!       (goto-char (cdr it))
!       (error "No filter group with name %s" name))))
  
  ;;;###autoload
  (defun ibuffer-kill-filter-group (name)
!   "Kill the filtering group named NAME.
  The group will be added to `ibuffer-filter-group-kill-ring'."
!   (interactive (list nil))
!   (when (interactive-p)
!     (setq name (completing-read "Kill filter group: "
!                               ibuffer-filter-groups nil t)))
    (when (equal name "Default")
!     (error "Can't kill default filtering group"))
    (ibuffer-aif (assoc name ibuffer-filter-groups)
        (progn
        (push (copy-tree it) ibuffer-filter-group-kill-ring)
--- 609,626 ----
  ;;;###autoload
  (defun ibuffer-jump-to-filter-group (name)
    "Move point to the filter group whose name is NAME."
!   (interactive (list (ibuffer-read-filter-group-name "Jump to filter group: 
")))
!   (ibuffer-aif (assoc name (ibuffer-current-filter-groups-with-position))
!       (goto-char (cdr it))
!     (error "No filter group with name %s" name)))
  
  ;;;###autoload
  (defun ibuffer-kill-filter-group (name)
!   "Kill the filter group named NAME.
  The group will be added to `ibuffer-filter-group-kill-ring'."
!   (interactive (list (ibuffer-read-filter-group-name "Kill filter group: " 
t)))
    (when (equal name "Default")
!     (error "Can't kill default filter group"))
    (ibuffer-aif (assoc name ibuffer-filter-groups)
        (progn
        (push (copy-tree it) ibuffer-filter-group-kill-ring)
***************
*** 620,626 ****
  
  ;;;###autoload
  (defun ibuffer-kill-line (&optional arg)
!   "Kill the filtering group at point.
  See also `ibuffer-kill-filter-group'."
    (interactive "P")
    (ibuffer-aif (save-excursion
--- 633,639 ----
  
  ;;;###autoload
  (defun ibuffer-kill-line (&optional arg)
!   "Kill the filter group at point.
  See also `ibuffer-kill-filter-group'."
    (interactive "P")
    (ibuffer-aif (save-excursion
***************
*** 656,667 ****
  ;;;###autoload
  (defun ibuffer-yank-filter-group (name)
    "Yank the last killed filter group before group named NAME."
!   (interactive (list nil))
!   (unless ibuffer-filter-group-kill-ring
!     (error "ibuffer-filter-group-kill-ring is empty"))
!   (when (and (not name) (interactive-p))
!     (setq name (completing-read "Yank filter group before group: "
!                               ibuffer-filter-groups nil t)))
    (save-excursion
      (ibuffer-forward-line 0)
      (ibuffer-insert-filter-group-before (pop ibuffer-filter-group-kill-ring)
--- 669,679 ----
  ;;;###autoload
  (defun ibuffer-yank-filter-group (name)
    "Yank the last killed filter group before group named NAME."
!   (interactive (list (progn
!                      (unless ibuffer-filter-group-kill-ring
!                        (error "ibuffer-filter-group-kill-ring is empty"))
!                      (ibuffer-read-filter-group-name
!                       "Yank filter group before group: "))))
    (save-excursion
      (ibuffer-forward-line 0)
      (ibuffer-insert-filter-group-before (pop ibuffer-filter-group-kill-ring)