-;;; ibuf-ext.el --- extensions for ibuffer
+;;; ibuf-ext.el --- extensions for ibuffer
;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
;; Author: Colin Walters <walters@verbum.org>
-;; Maintainer: John Paul Wallington <jpw@shootybangbang.com>
+;; Maintainer: John Paul Wallington <jpw@gnu.org>
;; Created: 2 Dec 2001
;; Keywords: buffer, convenience
(setq alist (delete entry alist)))
alist))
+;; borrowed from Gnus
+(defun ibuffer-remove-duplicates (list)
+ "Return a copy of LIST with duplicate elements removed."
+ (let ((new nil)
+ (tail list))
+ (while tail
+ (or (member (car tail) new)
+ (setq new (cons (car tail) new)))
+ (setq tail (cdr tail)))
+ (nreverse new)))
+
(defun ibuffer-split-list (ibuffer-split-list-fn ibuffer-split-list-elts)
(let ((hip-crowd nil)
(lamers nil))
(dolist (ibuffer-split-list-elt ibuffer-split-list-elts)
- (if (funcall ibuffer-split-list-fn ibuffer-split-list-elt)
+ (if (funcall ibuffer-split-list-fn ibuffer-split-list-elt)
(push ibuffer-split-list-elt hip-crowd)
(push ibuffer-split-list-elt lamers)))
;; Too bad Emacs Lisp doesn't have multiple values.
(defvar ibuffer-tmp-hide-regexps nil
"A list of regexps which should match buffer names to not show.")
-
+
(defvar ibuffer-tmp-show-regexps nil
"A list of regexps which should match buffer names to always show.")
((or (mode . message-mode)
(mode . mail-mode)
(mode . gnus-group-mode)
- (mode . gnus-summary-mode)
+ (mode . gnus-summary-mode)
(mode . gnus-article-mode))))
("programming"
((or (mode . emacs-lisp-mode)
(mode . cperl-mode)
(mode . c-mode)
- (mode . java-mode)
+ (mode . java-mode)
(mode . idl-mode)
(mode . lisp-mode)))))
-
+
"An alist of filter qualifiers to switch between.
This variable should look like ((\"STRING\" QUALIFIERS)
:group 'ibuffer)
(defvar ibuffer-cached-filter-formats nil)
-(defvar ibuffer-compiled-filter-formats nil)
+(defvar ibuffer-compiled-filter-formats nil)
(defvar ibuffer-filter-groups nil
"A list like ((\"NAME\" ((SYMBOL . QUALIFIER) ...) ...) which groups buffers.
:group 'ibuffer)
(defcustom ibuffer-saved-filter-groups nil
-
"An alist of filtering groups to switch between.
This variable should look like ((\"STRING\" QUALIFIERS)
(defcustom ibuffer-save-with-custom t
"If non-nil, then use Custom to save interactively changed variables.
Currently, this only applies to `ibuffer-saved-filters' and
-`ibuffer-saved-filter-groups."
+`ibuffer-saved-filter-groups'."
:type 'boolean
:group 'ibuffer)
(not
(ibuffer-buf-matches-predicates buf ibuffer-maybe-show-predicates)))
(or ibuffer-view-ibuffer
- (and ibuffer-buf
+ (and ibuffer-buf
(not (eq ibuffer-buf buf))))
(or
(ibuffer-included-in-filters-p buf ibuffer-filtering-qualifiers)
(if (assq 'mode ibuffer-filtering-qualifiers)
(setq ibuffer-filtering-qualifiers
(ibuffer-delete-alist 'mode ibuffer-filtering-qualifiers))
- (ibuffer-push-filter (cons 'mode
+ (ibuffer-push-filter (cons 'mode
(with-current-buffer buf
major-mode)))))
(ibuffer-update nil t))
;;;###autoload
(defun ibuffer-toggle-filter-group ()
"Toggle the display status of the filter group on this line."
- (interactive)
+ (interactive)
(ibuffer-toggle-filter-group-1 (point)))
-(defun ibuffer-toggle-filter-group-1 (posn)
+(defun ibuffer-toggle-filter-group-1 (posn)
(let ((name (get-text-property posn 'ibuffer-filter-group-name)))
(unless (stringp name)
(error "No filtering group name present"))
(mapcar (lambda (mode)
(cons (format "%s" mode) `((mode . ,mode))))
(let ((modes
- (delete-duplicates
+ (ibuffer-remove-duplicates
(mapcar (lambda (buf) (with-current-buffer buf major-mode))
(buffer-list)))))
(if ibuffer-view-ibuffer
#'kill-line arg)))
(defun ibuffer-insert-filter-group-before (newgroup group)
- (let ((pos (or (position group (mapcar #'car ibuffer-filter-groups)
- :test #'equal)
- (length ibuffer-filter-groups))))
- (cond ((<= pos 0)
- (push newgroup ibuffer-filter-groups))
- ((= pos (length ibuffer-filter-groups))
+ (let* ((found nil)
+ (pos (let ((groups (mapcar #'car ibuffer-filter-groups))
+ (res 0))
+ (while groups
+ (if (equal (car groups) group)
+ (setq found t
+ groups nil)
+ (incf res)
+ (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
(let ((cell (nthcdr pos ibuffer-filter-groups)))
(setf (cdr cell) (cons (car cell) (cdr cell)))
;;;###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: "))))
+ (interactive (list (ibuffer-read-filter-group-name
+ "Yank filter group before group: ")))
+ (unless ibuffer-filter-group-kill-ring
+ (error "The Ibuffer filter group kill-ring is empty"))
(save-excursion
(ibuffer-forward-line 0)
(ibuffer-insert-filter-group-before (pop ibuffer-filter-group-kill-ring)
(ibuffer-update nil t))
;;;###autoload
-(defun ibuffer-save-filter-groups (name groups)
+(defun ibuffer-save-filter-groups (name groups)
"Save all active filter groups GROUPS as NAME.
They are added to `ibuffer-saved-filter-groups'. Interactively,
prompt for NAME, and use the current filters."
turned into two separate filters [name: foo] and [mode: bar-mode]."
(interactive)
(when (null ibuffer-filtering-qualifiers)
- (error "No filters in effect"))
+ (error "No filters in effect"))
(let ((lim (pop ibuffer-filtering-qualifiers)))
(case (car lim)
(or
(defun ibuffer-format-filter-group-data (filter)
(if (equal filter "Default")
""
- (concat "Filter: " (mapconcat #'ibuffer-format-qualifier
- (cdr (assq filter ibuffer-filter-groups))
- " ") "\n")))
-
+ (concat "Filter:" (mapconcat #'ibuffer-format-qualifier
+ (cdr (assq filter ibuffer-filter-groups))
+ " "))))
+
(defun ibuffer-format-qualifier (qualifier)
(if (eq (car-safe qualifier) 'not)
(concat " [NOT" (ibuffer-format-qualifier-1 (cdr qualifier)) "]")
(unless qualifier
(error "Ibuffer: bad qualifier %s" qualifier))
(concat " [" (cadr type) ": " (format "%s]" (cdr qualifier)))))))
-
+
(defun ibuffer-list-buffer-modes ()
"Create an alist of buffer modes currently in use.
(modes)
(this-mode))
(while bufs
- (setq this-mode
- (with-current-buffer
+ (setq this-mode
+ (with-current-buffer
(car bufs)
major-mode)
bufs (cdr bufs))
- (add-to-list
+ (add-to-list
'modes
- `(,(symbol-name this-mode) .
+ `(,(symbol-name this-mode) .
,this-mode)))
- modes))
+ modes))
;;; Extra operation definitions
;;;###autoload (autoload 'ibuffer-filter-by-mode "ibuf-ext.el")
-(define-ibuffer-filter mode
+(define-ibuffer-filter mode
"Toggle current view to buffers with major mode QUALIFIER."
(:description "major mode"
:reader
(eq qualifier (with-current-buffer buf major-mode)))
;;;###autoload (autoload 'ibuffer-filter-by-used-mode "ibuf-ext.el")
-(define-ibuffer-filter used-mode
+(define-ibuffer-filter used-mode
"Toggle current view to buffers with major mode QUALIFIER.
Called interactively, this function allows selection of modes
currently used by buffers."
(:description "major mode in use"
:reader
- (intern
- (completing-read "Filter by major mode: "
+ (intern
+ (completing-read "Filter by major mode: "
(ibuffer-list-buffer-modes)
nil
t
(eq qualifier (with-current-buffer buf major-mode)))
;;;###autoload (autoload 'ibuffer-filter-by-name "ibuf-ext.el")
-(define-ibuffer-filter name
+(define-ibuffer-filter name
"Toggle current view to buffers with name matching QUALIFIER."
(:description "buffer name"
:reader (read-from-minibuffer "Filter by name (regexp): "))
(string-match qualifier it)))
;;;###autoload (autoload 'ibuffer-filter-by-size-gt "ibuf-ext.el")
-(define-ibuffer-filter size-gt
+(define-ibuffer-filter size-gt
"Toggle current view to buffers with size greater than QUALIFIER."
(:description "size greater than"
:reader
qualifier))
;;;###autoload (autoload 'ibuffer-filter-by-size-lt "ibuf-ext.el")
-(define-ibuffer-filter size-lt
+(define-ibuffer-filter size-lt
"Toggle current view to buffers with size less than QUALIFIER."
(:description "size less than"
:reader
(defun ibuffer-add-to-tmp-hide (regexp)
"Add REGEXP to `ibuffer-tmp-hide-regexps'.
This means that buffers whose name matches REGEXP will not be shown
-for this ibuffer session."
+for this Ibuffer session."
(interactive
(list
(read-from-minibuffer "Never show buffers matching: "
(defun ibuffer-add-to-tmp-show (regexp)
"Add REGEXP to `ibuffer-tmp-show-regexps'.
This means that buffers whose name matches REGEXP will always be shown
-for this ibuffer session."
+for this Ibuffer session."
(interactive
(list
(read-from-minibuffer "Always show buffers matching: "
;;;###autoload
(defun ibuffer-copy-filename-as-kill (&optional arg)
"Copy filenames of marked buffers into the kill ring.
+
The names are separated by a space.
If a buffer has no filename, it is ignored.
-With a zero prefix arg, use the complete pathname of each marked file.
-You can then feed the file name(s) to other commands with C-y.
+With no prefix arg, use the filename sans its directory of each marked file.
+With a zero prefix arg, use the complete filename of each marked file.
+With \\[universal-argument], use the filename of each marked file relative
+to `ibuffer-default-directory' iff non-nil, otherwise `default-directory'.
- [ This docstring shamelessly stolen from the
- `dired-copy-filename-as-kill' in \"dired-x\". ]"
- ;; Add to docstring later:
- ;; With C-u, use the relative pathname of each marked file.
- (interactive "P")
- (if (= (ibuffer-count-marked-lines) 0)
+You can then feed the file name(s) to other commands with \\[yank]."
+ (interactive "p")
+ (if (zerop (ibuffer-count-marked-lines))
(message "No buffers marked; use 'm' to mark a buffer")
(let ((ibuffer-copy-filename-as-kill-result "")
- (type (cond ((eql arg 0)
+ (type (cond ((zerop arg)
'full)
- ;; ((eql arg 4)
- ;; 'relative)
+ ((= arg 4)
+ 'relative)
(t
'name))))
(ibuffer-map-marked-lines
(case type
(full
name)
+ (relative
+ (file-relative-name
+ name (or ibuffer-default-directory
+ default-directory)))
(t
(file-name-nondirectory name)))
""))
" "))))
- (push ibuffer-copy-filename-as-kill-result kill-ring))))
+ (kill-new ibuffer-copy-filename-as-kill-result))))
(defun ibuffer-mark-on-buffer (func &optional ibuffer-mark-on-buffer-mark group)
(let ((count