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

[John Paul Wallington]

Index: emacs/lisp/ibuf-ext.el
diff -c emacs/lisp/ibuf-ext.el:1.33 emacs/lisp/ibuf-ext.el:1.34
*** emacs/lisp/ibuf-ext.el:1.33 Fri Apr  4 16:47:03 2003
--- emacs/lisp/ibuf-ext.el      Sat Jul  5 07:20:30 2003
***************
*** 35,41 ****
  (require 'ibuffer)
  
  (eval-when-compile
-   (require 'derived)
    (require 'ibuf-macs)
    (require 'cl))
  
--- 35,40 ----
***************
*** 556,562 ****
                    (cons (format "%s" mode) `((mode . ,mode))))
                  (let ((modes
                         (ibuffer-remove-duplicates
!                         (mapcar (lambda (buf) (with-current-buffer buf 
major-mode))
                                  (buffer-list)))))
                    (if ibuffer-view-ibuffer
                      modes
--- 555,562 ----
                    (cons (format "%s" mode) `((mode . ,mode))))
                  (let ((modes
                         (ibuffer-remove-duplicates
!                         (mapcar (lambda (buf) 
!                                 (with-current-buffer buf major-mode))
                                  (buffer-list)))))
                    (if ibuffer-view-ibuffer
                      modes
***************
*** 586,592 ****
  ;;;###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)
--- 586,593 ----
  ;;;###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)
***************
*** 620,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)))
--- 621,628 ----
  ;;;###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)))
***************
*** 667,673 ****
                    (setq groups (cdr groups))))
                res)))
      (cond ((not found)
!          (setq ibuffer-filter-groups (nconc ibuffer-filter-groups (list 
newgroup))))
          ((zerop pos)
           (push newgroup ibuffer-filter-groups))
          (t
--- 669,676 ----
                    (setq groups (cdr groups))))
                res)))
      (cond ((not found)
!          (setq ibuffer-filter-groups
!                (nconc ibuffer-filter-groups (list newgroup))))
          ((zerop pos)
           (push newgroup ibuffer-filter-groups))
          (t
***************
*** 836,849 ****
                  (not (eq 'or (caar ibuffer-filtering-qualifiers))))
          (error "Top filter is not an OR"))
        (let ((lim (pop ibuffer-filtering-qualifiers)))
!         (setq ibuffer-filtering-qualifiers (nconc (cdr lim) 
ibuffer-filtering-qualifiers))))
      (when (< (length ibuffer-filtering-qualifiers) 2)
        (error "Need two filters to OR"))
      ;; If the second filter is an OR, just add to it.
      (let ((first (pop ibuffer-filtering-qualifiers))
          (second (pop ibuffer-filtering-qualifiers)))
        (if (eq 'or (car second))
!         (push (nconc (list 'or first) (cdr second)) 
ibuffer-filtering-qualifiers)
        (push (list 'or first second)
              ibuffer-filtering-qualifiers))))
    (ibuffer-update nil t))
--- 839,854 ----
                  (not (eq 'or (caar ibuffer-filtering-qualifiers))))
          (error "Top filter is not an OR"))
        (let ((lim (pop ibuffer-filtering-qualifiers)))
!         (setq ibuffer-filtering-qualifiers 
!               (nconc (cdr lim) ibuffer-filtering-qualifiers))))
      (when (< (length ibuffer-filtering-qualifiers) 2)
        (error "Need two filters to OR"))
      ;; If the second filter is an OR, just add to it.
      (let ((first (pop ibuffer-filtering-qualifiers))
          (second (pop ibuffer-filtering-qualifiers)))
        (if (eq 'or (car second))
!         (push (nconc (list 'or first) (cdr second))
!               ibuffer-filtering-qualifiers)
        (push (list 'or first second)
              ibuffer-filtering-qualifiers))))
    (ibuffer-update nil t))