Fix cut'n'paste during a multi-display session (Mark Plaksin, Robert Chassell).

[gnu-emacs] / lisp / ibuf-macs.el

diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index b73624a893cf1b8bdc3aad2df1add3991a4f62bc..d6b4c2e1da8ef7962439d0cb71fd7147ce7352ae 100644 (file)
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -1,8 +1,9 @@
 ;;; ibuf-macs.el --- macros for ibuffer
 
-;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
+;; Maintainer: John Paul Wallington <jpw@gnu.org>
 ;; Created: 6 Dec 2001
 ;; Keywords: buffer, convenience
 
@@ -23,6 +24,8 @@
 ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (eval-when-compile
@@ -34,7 +37,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 +56,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
@@ -76,8 +79,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
@@ -122,7 +125,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.
@@ -149,7 +152,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 +161,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.
 
@@ -186,7 +191,9 @@ confirmation message, in the form:
 COMPLEX means this function is special; see the source code of this
 macro for exactly what it does."
   `(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))
@@ -246,7 +253,7 @@ macro for exactly what it does."
 
 ;;;###autoload
 (defmacro* define-ibuffer-filter (name documentation
-                                      (&key 
+                                      (&key
                                        reader
                                        description)
                                       &rest body)
@@ -260,7 +267,7 @@ 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."
   (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 +286,5 @@ bound to the current value of the filter."
 
 (provide 'ibuf-macs)
 
+;;; arch-tag: 2748edce-82c9-4cd9-9d9d-bd73e43c20c5
 ;;; ibuf-macs.el ends here