-;;; ibuf-ext.el --- extensions for ibuffer
+;;; ibuf-ext.el --- extensions for ibuffer
-;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Colin Walters <walters@verbum.org>
+;; Maintainer: John Paul Wallington <jpw@gnu.org>
;; Created: 2 Dec 2001
;; Keywords: buffer, convenience
;; You should have received a copy of the GNU General Public License
;; along with this program ; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
(require 'ibuffer)
(eval-when-compile
- (require 'derived)
(require 'ibuf-macs)
(require 'cl))
(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.
If a function, it will be called with the buffer as an argument, and
should return non-nil if this buffer should not be shown."
:type '(repeat (choice regexp function))
+ :require 'ibuf-ext
:group 'ibuffer)
(defcustom ibuffer-always-show-predicates nil
(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.
:type 'boolean
:group 'ibuffer)
-(defcustom ibuffer-saved-filter-groups
- '(("gnus"
- ((or (mode . message-mode)
- (mode . mail-mode)
- (mode . gnus-group-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 . idl-mode)
- (mode . lisp-mode)))))
-
+(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)
(ibuffer-buf-matches-predicates buf ibuffer-always-show-predicates)))))
(defun ibuffer-auto-update-changed ()
- (when ibuffer-auto-buffers-changed
- (setq ibuffer-auto-buffers-changed nil)
+ (when (frame-or-buffer-changed-p 'ibuffer-auto-buffers-changed)
(mapcar #'(lambda (buf)
(ignore-errors
(with-current-buffer buf
(if arg
(plusp arg)
(not ibuffer-auto-mode)))
- (defadvice get-buffer-create (after ibuffer-notify-create activate)
- (setq ibuffer-auto-buffers-changed t))
- (defadvice kill-buffer (after ibuffer-notify-kill activate)
- (setq ibuffer-auto-buffers-changed t))
+ (frame-or-buffer-changed-p 'ibuffer-auto-buffers-changed)
(add-hook 'post-command-hook 'ibuffer-auto-update-changed)
(ibuffer-update-mode-name))
"Enable or disable filtering by the major mode at point."
(interactive "d")
(if (eventp event-or-point)
- (mouse-set-point event-or-point)
+ (posn-set-point (event-end event-or-point))
(goto-char event-or-point))
(let ((buf (ibuffer-current-buffer)))
(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"))
(ibuffer-backward-filter-group 1))
(ibuffer-forward-line 0))
-;;;###autoload (autoload 'ibuffer-do-shell-command-pipe "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-shell-command-pipe "ibuf-ext")
(define-ibuffer-op shell-command-pipe (command)
"Pipe the contents of each marked buffer to shell command COMMAND."
(:interactive "sPipe to shell command: "
(point-min) (point-max) command
(get-buffer-create "* ibuffer-shell-output*")))
-;;;###autoload (autoload 'ibuffer-do-shell-command-pipe-replace "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-shell-command-pipe-replace "ibuf-ext")
(define-ibuffer-op shell-command-pipe-replace (command)
"Replace the contents of marked buffers with output of pipe to COMMAND."
(:interactive "sPipe to shell command (replace): "
(shell-command-on-region (point-min) (point-max)
command nil t)))
-;;;###autoload (autoload 'ibuffer-do-shell-command-file "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-shell-command-file "ibuf-ext")
(define-ibuffer-op shell-command-file (command)
"Run shell command COMMAND separately on files of marked buffers."
(:interactive "sShell command on buffer's file: "
(make-temp-file
(substring (buffer-name) 0 (min 10 (length (buffer-name))))))))))
-;;;###autoload (autoload 'ibuffer-do-eval "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-eval "ibuf-ext")
(define-ibuffer-op eval (form)
"Evaluate FORM in each of the buffers.
Does not display the buffer during evaluation. See
:modifier-p :maybe)
(eval form))
-;;;###autoload (autoload 'ibuffer-do-view-and-eval "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-view-and-eval "ibuf-ext")
(define-ibuffer-op view-and-eval (form)
"Evaluate FORM while displaying each of the marked buffers.
To evaluate a form without viewing the buffer, see `ibuffer-do-eval'."
(eval form))
(switch-to-buffer ibuffer-buf))))
-;;;###autoload (autoload 'ibuffer-do-rename-uniquely "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-rename-uniquely "ibuf-ext")
(define-ibuffer-op rename-uniquely ()
"Rename marked buffers as with `rename-uniquely'."
(:opstring "renamed"
:modifier-p t)
(rename-uniquely))
-;;;###autoload (autoload 'ibuffer-do-revert "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-revert "ibuf-ext")
(define-ibuffer-op revert ()
"Revert marked buffers as with `revert-buffer'."
(:dangerous t
:modifier-p :maybe)
(revert-buffer t t))
-;;;###autoload (autoload 'ibuffer-do-replace-regexp "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-replace-regexp "ibuf-ext")
(define-ibuffer-op replace-regexp (from-str to-str)
"Perform a `replace-regexp' in marked buffers."
(:interactive
(replace-match to-str))))
t))
-;;;###autoload (autoload 'ibuffer-do-query-replace "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-query-replace "ibuf-ext")
(define-ibuffer-op query-replace (&rest args)
"Perform a `query-replace' in marked buffers."
(:interactive
(apply #'query-replace args)))
t))
-;;;###autoload (autoload 'ibuffer-do-query-replace-regexp "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-query-replace-regexp "ibuf-ext")
(define-ibuffer-op query-replace-regexp (&rest args)
"Perform a `query-replace-regexp' in marked buffers."
(:interactive
(apply #'query-replace-regexp args)))
t))
-;;;###autoload (autoload 'ibuffer-do-print "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-print "ibuf-ext")
(define-ibuffer-op print ()
"Print marked buffers as with `print-buffer'."
(:opstring "printed"
buf
(cdr filter))))))))))
-(defun ibuffer-generate-filter-groups (bmarklist)
- (let ((filter-group-alist (append ibuffer-filter-groups
- (list (cons "Default" nil)))))
+(defun ibuffer-generate-filter-groups (bmarklist &optional noempty nodefault)
+ (let ((filter-group-alist (if nodefault
+ ibuffer-filter-groups
+ (append ibuffer-filter-groups
+ (list (cons "Default" nil))))))
;; (dolist (hidden ibuffer-hidden-filter-groups)
;; (setq filter-group-alist (ibuffer-delete-alist
;; hidden filter-group-alist)))
(aset vec i hip-crowd)
(incf i)
(setq bmarklist lamers))))
- (let ((ret nil))
+ (let (ret)
(dotimes (j i ret)
- (push (cons (car (nth j filter-group-alist))
- (aref vec j))
- ret))))))
+ (let ((bufs (aref vec j)))
+ (unless (and noempty (null bufs))
+ (push (cons (car (nth j filter-group-alist))
+ bufs)
+ ret))))))))
;;;###autoload
(defun ibuffer-filters-to-filter-group (name)
"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)))))
+ (mapcar (lambda (mode)
+ (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
+ (delq 'ibuffer-mode modes)))))
(ibuffer-update nil t))
;;;###autoload
(defun ibuffer-pop-filter-group ()
- "Remove the first filtering group."
+ "Remove the first filter group."
(interactive)
(when (null ibuffer-filter-groups)
- (error "No filtering groups active"))
- (pop 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"))
+ ;; `ibuffer-generate-filter-groups' returns all non-hidden filter
+ ;; groups, possibly excluding empty groups or Default.
+ ;; We add `ibuffer-hidden-filter-groups' to the list, excluding
+ ;; Default if necessary.
+ (completing-read msg (nconc
+ (ibuffer-generate-filter-groups
+ (ibuffer-current-state-list)
+ (not ibuffer-show-empty-filter-groups)
+ nodefault)
+ (if nodefault
+ (remove "Default" ibuffer-hidden-filter-groups)
+ ibuffer-hidden-filter-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 filtering groups."
+ "Remove all filter groups."
(interactive)
- (setq ibuffer-filter-groups nil)
+ (setq ibuffer-filter-groups nil
+ ibuffer-hidden-filter-groups nil)
(ibuffer-update nil t))
(defun ibuffer-current-filter-groups-with-position ()
;;;###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))))
+ (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)
- "Delete the filtering group named NAME."
- (interactive (list nil))
- (when (interactive-p)
- (setq name (completing-read "Kill filter group: "
- ibuffer-filter-groups nil t)))
+ "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)
- (setq ibuffer-filter-groups (ibuffer-delete-alist
- name ibuffer-filter-groups))
+ (progn
+ (push (copy-tree it) ibuffer-filter-group-kill-ring)
+ (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))
;;;###autoload
-(defun ibuffer-kill-line (&optional arg)
- (interactive "P")
+(defun ibuffer-kill-line (&optional arg interactive-p)
+ "Kill the filter group at point.
+See also `ibuffer-kill-filter-group'."
+ (interactive "P\np")
(ibuffer-aif (save-excursion
(ibuffer-forward-line 0)
(get-text-property (point) 'ibuffer-filter-group-name))
(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)
+ (funcall (if interactive-p #'call-interactively #'funcall)
#'kill-line arg)))
+(defun ibuffer-insert-filter-group-before (newgroup group)
+ (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)))
+ (setf (car cell) newgroup))))))
+
;;;###autoload
-(defun ibuffer-yank (&optional arg)
- (interactive "P")
+(defun ibuffer-yank ()
+ "Yank the last killed filter group before group at point."
+ (interactive)
+ (ibuffer-yank-filter-group
+ (or (get-text-property (point) 'ibuffer-filter-group-name)
+ (get-text-property (point) 'ibuffer-filter-group)
+ (error "No filter group at point"))))
+
+;;;###autoload
+(defun ibuffer-yank-filter-group (name)
+ "Yank the last killed filter group before group named NAME."
+ (interactive (list (ibuffer-read-filter-group-name
+ "Yank filter group before group: ")))
(unless ibuffer-filter-group-kill-ring
- (error "ibuffer-filter-group-kill-ring is empty"))
+ (error "The Ibuffer filter group kill-ring is empty"))
(save-excursion
(ibuffer-forward-line 0)
- (let* ((last-killed (pop ibuffer-filter-group-kill-ring))
- (all-groups ibuffer-filter-groups)
- (cur (or (get-text-property (point) 'ibuffer-filter-group-name)
- (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)))
- (nconc ibuffer-filter-groups (list last-killed)))
- (t
- (let ((cell (nthcdr pos ibuffer-filter-groups)))
- (setf (cdr cell) (cons (car cell) (cdr cell)))
- (setf (car cell) last-killed))))))
+ (ibuffer-insert-filter-group-before (pop ibuffer-filter-group-kill-ring)
+ name))
(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."
ibuffer-filter-groups)))
(ibuffer-aif (assoc name ibuffer-saved-filter-groups)
(setcdr it groups)
- (push (list name groups) ibuffer-saved-filter-groups))
+ (push (cons name groups) ibuffer-saved-filter-groups))
(ibuffer-maybe-save-stuff)
(ibuffer-update-mode-name))
(interactive
(list
(if (null ibuffer-saved-filter-groups)
- (error "No saved filters")
- (completing-read "Delete saved filters: "
+ (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))
(error "No saved filters")
(completing-read "Switch to saved filter group: "
ibuffer-saved-filter-groups nil t))))
- (setq ibuffer-filter-groups (assoc name ibuffer-saved-filter-groups))
+ (setq ibuffer-filter-groups (cdr (assoc name ibuffer-saved-filter-groups))
+ ibuffer-hidden-filter-groups nil)
(ibuffer-update nil t))
;;;###autoload
"Disable all filters currently in effect in this buffer."
(interactive)
(setq ibuffer-filtering-qualifiers nil)
- (ibuffer-update nil t))
+ (let ((buf (ibuffer-current-buffer)))
+ (ibuffer-update nil t)
+ (when buf
+ (ibuffer-jump-to-buffer (buffer-name buf)))))
;;;###autoload
(defun ibuffer-pop-filter ()
(when (null ibuffer-filtering-qualifiers)
(error "No filters in effect"))
(pop ibuffer-filtering-qualifiers)
- (ibuffer-update nil t))
+ (let ((buf (ibuffer-current-buffer)))
+ (ibuffer-update nil t)
+ (when buf
+ (ibuffer-jump-to-buffer (buffer-name buf)))))
(defun ibuffer-push-filter (qualifier)
"Add QUALIFIER to `ibuffer-filtering-qualifiers'."
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
(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))))
+ (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 (nconc (list 'or first) (cdr second))
+ ibuffer-filtering-qualifiers)
(push (list 'or first second)
ibuffer-filtering-qualifiers))))
(ibuffer-update nil t))
ibuffer-saved-filters nil t))))
(setq ibuffer-filtering-qualifiers (list (cons 'saved name)))
(ibuffer-update nil t))
-
+
+(defun ibuffer-format-filter-group-data (filter)
+ (if (equal filter "Default")
+ ""
+ (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.
+The list returned will be of the form (\"MODE-NAME\" . MODE-SYMBOL)."
+ (let ((bufs (buffer-list))
+ (modes)
+ (this-mode))
+ (while bufs
+ (setq this-mode
+ (with-current-buffer
+ (car bufs)
+ major-mode)
+ bufs (cdr bufs))
+ (add-to-list
+ 'modes
+ `(,(symbol-name this-mode) .
+ ,this-mode)))
+ modes))
+
+
;;; Extra operation definitions
-;;;###autoload (autoload 'ibuffer-filter-by-mode "ibuf-ext.el")
-(define-ibuffer-filter mode
+;;;###autoload (autoload 'ibuffer-filter-by-mode "ibuf-ext")
+(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-name "ibuf-ext.el")
-(define-ibuffer-filter name
+;;;###autoload (autoload 'ibuffer-filter-by-used-mode "ibuf-ext")
+(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: "
+ (ibuffer-list-buffer-modes)
+ nil
+ t
+ (let ((buf (ibuffer-current-buffer)))
+ (if (and buf (buffer-live-p buf))
+ (with-current-buffer buf
+ (symbol-name major-mode))
+ "")))))
+ (eq qualifier (with-current-buffer buf major-mode)))
+
+;;;###autoload (autoload 'ibuffer-filter-by-name "ibuf-ext")
+(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 (buffer-name buf)))
-;;;###autoload (autoload 'ibuffer-filter-by-filename "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-filter-by-filename "ibuf-ext")
(define-ibuffer-filter filename
"Toggle current view to buffers with filename matching QUALIFIER."
(:description "filename"
:reader (read-from-minibuffer "Filter by filename (regexp): "))
- (ibuffer-awhen (buffer-file-name buf)
+ (ibuffer-awhen (with-current-buffer buf
+ (or buffer-file-name
+ (and (boundp 'dired-directory)
+ (let ((dired-dir
+ (if (stringp dired-directory)
+ dired-directory
+ (car dired-directory))))
+ (and dired-dir
+ (expand-file-name dired-dir))))))
(string-match qualifier it)))
-;;;###autoload (autoload 'ibuffer-filter-by-size-gt "ibuf-ext.el")
-(define-ibuffer-filter size-gt
+;;;###autoload (autoload 'ibuffer-filter-by-size-gt "ibuf-ext")
+(define-ibuffer-filter size-gt
"Toggle current view to buffers with size greater than QUALIFIER."
(:description "size greater than"
:reader
(> (with-current-buffer buf (buffer-size))
qualifier))
-;;;###autoload (autoload 'ibuffer-filter-by-size-lt "ibuf-ext.el")
-(define-ibuffer-filter size-lt
+;;;###autoload (autoload 'ibuffer-filter-by-size-lt "ibuf-ext")
+(define-ibuffer-filter size-lt
"Toggle current view to buffers with size less than QUALIFIER."
(:description "size less than"
:reader
(< (with-current-buffer buf (buffer-size))
qualifier))
-;;;###autoload (autoload 'ibuffer-filter-by-content "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-filter-by-content "ibuf-ext")
(define-ibuffer-filter content
"Toggle current view to buffers whose contents match QUALIFIER."
(:description "content"
(goto-char (point-min))
(re-search-forward qualifier nil t))))
-;;;###autoload (autoload 'ibuffer-filter-by-predicate "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-filter-by-predicate "ibuf-ext")
(define-ibuffer-filter predicate
"Toggle current view to buffers for which QUALIFIER returns non-nil."
(:description "predicate"
"normal"))
(ibuffer-redisplay t))
-;;;###autoload (autoload 'ibuffer-do-sort-by-major-mode "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-sort-by-major-mode "ibuf-ext")
(define-ibuffer-sorter major-mode
"Sort the buffers by major modes.
Ordering is lexicographic."
(car b)
major-mode)))))
-;;;###autoload (autoload 'ibuffer-do-sort-by-mode-name "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-sort-by-mode-name "ibuf-ext")
(define-ibuffer-sorter mode-name
"Sort the buffers by their mode name.
Ordering is lexicographic."
(car b)
mode-name))))
-;;;###autoload (autoload 'ibuffer-do-sort-by-alphabetic "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-sort-by-alphabetic "ibuf-ext")
(define-ibuffer-sorter alphabetic
"Sort the buffers by their names.
Ordering is lexicographic."
(buffer-name (car a))
(buffer-name (car b))))
-;;;###autoload (autoload 'ibuffer-do-sort-by-size "ibuf-ext.el")
+;;;###autoload (autoload 'ibuffer-do-sort-by-size "ibuf-ext")
(define-ibuffer-sorter size
"Sort the buffers by their size."
(:description "size")
(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-jump-to-buffer (name)
- "Move point to the buffer whose name is NAME."
- (interactive (list nil))
- (let ((table (mapcar #'(lambda (x)
- (cons (buffer-name (car x))
- (caddr x)))
- (ibuffer-current-state-list t))))
- (when (null table)
- (error "No buffers!"))
- (when (interactive-p)
- (setq name (completing-read "Jump to buffer: " table nil t)))
- (ibuffer-aif (assoc name table)
- (goto-char (cdr it))
- (error "No buffer with name %s" name))))
+ "Move point to the buffer whose name is NAME.
+
+If called interactively, prompt for a buffer name and go to the
+corresponding line in the Ibuffer buffer. If said buffer is in a
+hidden group filter, open it.
+
+If `ibuffer-jump-offer-only-visible-buffers' is non-nil, only offer
+visible buffers in the completion list. Calling the command with
+a prefix argument reverses the meaning of that variable."
+ (interactive (list
+ (let ((only-visible ibuffer-jump-offer-only-visible-buffers))
+ (when current-prefix-arg
+ (setq only-visible (not only-visible)))
+ (if only-visible
+ (let ((table (mapcar #'(lambda (x)
+ (buffer-name (car x)))
+ (ibuffer-current-state-list))))
+ (when (null table)
+ (error "No buffers!"))
+ (completing-read "Jump to buffer: "
+ table nil t))
+ (read-buffer "Jump to buffer: " nil t)))))
+ (when (not (string= "" name))
+ (let (buf-point)
+ ;; Blindly search for our buffer: it is very likely that it is
+ ;; not in a hidden filter group.
+ (ibuffer-map-lines #'(lambda (buf marks)
+ (when (string= (buffer-name buf) name)
+ (setq buf-point (point))
+ nil))
+ t nil)
+ (when (and
+ (null buf-point)
+ (not (null ibuffer-hidden-filter-groups)))
+ ;; We did not find our buffer. It must be in a hidden filter
+ ;; group, so go through all hidden filter groups to find it.
+ (catch 'found
+ (dolist (group ibuffer-hidden-filter-groups)
+ (ibuffer-jump-to-filter-group group)
+ (ibuffer-toggle-filter-group)
+ (ibuffer-map-lines #'(lambda (buf marks)
+ (when (string= (buffer-name buf) name)
+ (setq buf-point (point))
+ nil))
+ t group)
+ (if buf-point
+ (throw 'found nil)
+ (ibuffer-toggle-filter-group)))))
+ (if (null buf-point)
+ ;; Still not found even though we expanded all hidden filter
+ ;; groups: that must be because it's hidden by predicate:
+ ;; we won't bother trying to display it.
+ (error "No buffer with name %s" name)
+ (goto-char buf-point)))))
;;;###autoload
(defun ibuffer-diff-with-file ()
"View the differences between this buffer and its associated file.
This requires the external program \"diff\" to be in your `exec-path'."
(interactive)
- (let* ((buf (ibuffer-current-buffer))
- (buf-filename (with-current-buffer buf
- buffer-file-name)))
+ (let ((buf (ibuffer-current-buffer)))
(unless (buffer-live-p buf)
(error "Buffer %s has been killed" buf))
- (unless buf-filename
- (error "Buffer %s has no associated file" buf))
- (let ((diff-buf (get-buffer-create "*Ibuffer-diff*")))
- (with-current-buffer diff-buf
- (setq buffer-read-only nil)
- (erase-buffer))
- (let ((tempfile (make-temp-file "ibuffer-diff-")))
- (unwind-protect
- (progn
- (with-current-buffer buf
- (write-region (point-min) (point-max) tempfile nil 'nomessage))
- (if (zerop
- (apply #'call-process "diff" nil diff-buf nil
- (append
- (when (and (boundp 'ediff-custom-diff-options)
- (stringp ediff-custom-diff-options))
- (list ediff-custom-diff-options))
- (list buf-filename tempfile))))
- (message "No differences found")
- (progn
- (with-current-buffer diff-buf
- (goto-char (point-min))
- (if (fboundp 'diff-mode)
- (diff-mode)
- (fundamental-mode)))
- (display-buffer diff-buf))))
- (when (file-exists-p tempfile)
- (delete-file tempfile)))))
- nil))
+ (diff-buffer-with-file buf)))
;;;###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
(with-current-buffer buf
(memq major-mode ibuffer-help-buffer-modes)))))
+;;;###autoload
+(defun ibuffer-mark-compressed-file-buffers ()
+ "Mark buffers whose associated file is compressed."
+ (interactive)
+ (ibuffer-mark-on-buffer
+ #'(lambda (buf)
+ (with-current-buffer buf
+ (and buffer-file-name
+ (string-match ibuffer-compressed-file-name-regexp
+ buffer-file-name))))))
+
;;;###autoload
(defun ibuffer-mark-old-buffers ()
"Mark buffers which have not been viewed in `ibuffer-old-time' days."
(interactive (occur-read-primary-args))
(if (or (not (integerp nlines))
(< nlines 0))
- (setq nlines 1))
+ (setq nlines 0))
(when (zerop (ibuffer-count-marked-lines))
(ibuffer-set-mark ibuffer-marked-char))
(let ((ibuffer-do-occur-bufs nil))
(provide 'ibuf-ext)
+;;; arch-tag: 9af21953-deda-4c30-b76d-f81d9128e76d
;;; ibuf-ext.el ends here