X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ceb449353ba812ccf3be57c6ab8bf54ab01b121c..8d892d7fef218001fa8ef828db4a5a864448f950:/lisp/ibuf-macs.el diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el index 23b5e18fed..5274e3173e 100644 --- a/lisp/ibuf-macs.el +++ b/lisp/ibuf-macs.el @@ -1,12 +1,14 @@ ;;; ibuf-macs.el --- macros for ibuffer -;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Colin Walters +;; Maintainer: John Paul Wallington ;; Created: 6 Dec 2001 ;; Keywords: buffer, convenience -;; This file is not currently part of GNU Emacs. +;; This file is part of GNU Emacs. ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -20,8 +22,10 @@ ;; 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: ;;; Code: @@ -34,7 +38,7 @@ If TEST returns non-nil, bind `it' to the value, and evaluate TRUE-BODY. Otherwise, evaluate forms in FALSE-BODY as if in `progn'. Compare with `if'." - (let ((sym (gensym "--ibuffer-aif-"))) + (let ((sym (make-symbol "ibuffer-aif-sym"))) `(let ((,sym ,test)) (if ,sym (let ((it ,sym)) @@ -53,7 +57,7 @@ During evaluation of body, bind `it' to the value returned by TEST." (defmacro ibuffer-save-marks (&rest body) "Save the marked status of the buffers and execute BODY; restore marks." - (let ((bufsym (gensym))) + (let ((bufsym (make-symbol "bufsym"))) `(let ((,bufsym (current-buffer)) (ibuffer-save-marks-tmp-mark-list (ibuffer-current-state-list))) (unwind-protect @@ -61,7 +65,7 @@ During evaluation of body, bind `it' to the value returned by TEST." (save-excursion ,@body)) (with-current-buffer ,bufsym - (ibuffer-insert-buffers-and-marks + (ibuffer-redisplay-engine ;; Get rid of dead buffers (delq nil (mapcar #'(lambda (e) (when (buffer-live-p (car e)) @@ -76,8 +80,8 @@ During evaluation of body, bind `it' to the value returned by TEST." "Define a column SYMBOL for use with `ibuffer-formats'. BODY will be called with `buffer' bound to the buffer object, and -`mark' bound to the current mark on the buffer. The current buffer -will be `buffer'. +`mark' bound to the current mark on the buffer. The original ibuffer +buffer will be bound to `ibuffer-buf'. If NAME is given, it will be used as a title for the column. Otherwise, the title will default to a capitalized version of the @@ -90,7 +94,9 @@ Note that this macro expands into a `defun' for a function named ibuffer-make-column-NAME. If INLINE is non-nil, then the form will be inlined into the compiled format versions. This means that if you change its definition, you should explicitly call -`ibuffer-recompile-formats'." +`ibuffer-recompile-formats'. + +\(fn SYMBOL (&key NAME INLINE PROPS SUMMARIZER) &rest BODY)" (let* ((sym (intern (concat "ibuffer-make-column-" (symbol-name symbol)))) (bod-1 `(with-current-buffer buffer @@ -122,7 +128,7 @@ change its definition, you should explicitly call ;;;###autoload (defmacro* define-ibuffer-sorter (name documentation - (&key + (&key description) &rest body) "Define a method of sorting named NAME. @@ -132,7 +138,9 @@ DESCRIPTION is a short string describing the sorting method. For sorting, the forms in BODY will be evaluated with `a' bound to one buffer object, and `b' bound to another. BODY should return a non-nil -value if and only if `a' is \"less than\" `b'." +value if and only if `a' is \"less than\" `b'. + +\(fn NAME DOCUMENTATION (&key DESCRIPTION) &rest BODY)" `(progn (defun ,(intern (concat "ibuffer-do-sort-by-" (symbol-name name))) () ,(or documentation "No :documentation specified for this sorting method.") @@ -149,7 +157,7 @@ value if and only if `a' is \"less than\" `b'." ;;;###autoload (defmacro* define-ibuffer-op (op args documentation - (&key + (&key interactive mark modifier-p @@ -158,7 +166,9 @@ value if and only if `a' is \"less than\" `b'." (active-opstring "Operate on") complex) &rest body) - "Generate a function named `ibuffer-do-OP', which operates on a buffer. + "Generate a function which operates on a buffer. +OP becomes the name of the function; if it doesn't begin with +`ibuffer-do-', then that is prepended to it. When an operation is performed, this function will be called once for each marked buffer, with that buffer current. @@ -184,9 +194,13 @@ ACTIVE-OPSTRING is a string which will be displayed to the user in a confirmation message, in the form: \"Really ACTIVE-OPSTRING x buffers?\" COMPLEX means this function is special; see the source code of this -macro for exactly what it does." +macro for exactly what it does. + +\(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS OPSTRING ACTIVE-OPSTRING COMPLEX) &rest BODY)" `(progn - (defun ,(intern (concat "ibuffer-do-" (symbol-name op))) ,args + (defun ,(intern (concat (if (string-match "^ibuffer-do" (symbol-name op)) + "" "ibuffer-do-") (symbol-name op))) + ,args ,(if (stringp documentation) documentation (format "%s marked buffers." active-opstring)) @@ -227,7 +241,7 @@ macro for exactly what it does." 'ibuffer-map-deletion-lines) (t 'ibuffer-map-marked-lines)) - #'(lambda (buf mark beg end) + #'(lambda (buf mark) ,(if (eq modifier-p :maybe) `(let ((ibuffer-tmp-previous-buffer-modification (buffer-modified-p buf))) @@ -246,7 +260,7 @@ macro for exactly what it does." ;;;###autoload (defmacro* define-ibuffer-filter (name documentation - (&key + (&key reader description) &rest body) @@ -258,9 +272,11 @@ DESCRIPTION is a short string describing the filter. BODY should contain forms which will be evaluated to test whether or not a particular buffer should be displayed or not. The forms in BODY will be evaluated with BUF bound to the buffer object, and QUALIFIER -bound to the current value of the filter." +bound to the current value of the filter. + +\(fn NAME DOCUMENTATION (&key READER DESCRIPTION) &rest BODY)" (let ((fn-name (intern (concat "ibuffer-filter-by-" (symbol-name name))))) - `(progn + `(progn (defun ,fn-name (qualifier) ,(concat (or documentation "This filter is not documented.")) (interactive (list ,reader)) @@ -279,4 +295,5 @@ bound to the current value of the filter." (provide 'ibuf-macs) +;;; arch-tag: 2748edce-82c9-4cd9-9d9d-bd73e43c20c5 ;;; ibuf-macs.el ends here