[Emacs-diffs] Changes to emacs/lisp/ibuf-macs.el,v

[John Paul Wallington]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     John Paul Wallington <jpw>      08/05/15 00:09:10

Index: ibuf-macs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ibuf-macs.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- ibuf-macs.el        6 May 2008 07:57:38 -0000       1.28
+++ ibuf-macs.el        15 May 2008 00:09:09 -0000      1.29
@@ -36,6 +36,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'."
+  (declare (indent 2))
   (let ((sym (make-symbol "ibuffer-aif-sym")))
     `(let ((,sym ,test))
        (if ,sym
@@ -43,18 +44,18 @@
             ,true-body)
         (progn
           ,@false-body)))))
-;; (put 'ibuffer-aif 'lisp-indent-function 2)
 
 (defmacro ibuffer-awhen (test &rest body)
   "Evaluate BODY if TEST returns non-nil.
 During evaluation of body, bind `it' to the value returned by TEST."
+  (declare (indent 1))
   `(ibuffer-aif ,test
        (progn ,@body)
      nil))
-;; (put 'ibuffer-awhen 'lisp-indent-function 1)
 
 (defmacro ibuffer-save-marks (&rest body)
   "Save the marked status of the buffers and execute BODY; restore marks."
+  (declare (indent 0))
   (let ((bufsym (make-symbol "bufsym")))
     `(let ((,bufsym (current-buffer))
           (ibuffer-save-marks-tmp-mark-list (ibuffer-current-state-list)))
@@ -70,7 +71,6 @@
                                          e))
                          ibuffer-save-marks-tmp-mark-list)))
           (ibuffer-redisplay t))))))
-;; (put 'ibuffer-save-marks 'lisp-indent-function 0)
 
 ;;;###autoload
 (defmacro* define-ibuffer-column (symbol (&key name inline props summarizer 
@@ -98,6 +98,7 @@
 `ibuffer-recompile-formats'.
 
 \(fn SYMBOL (&key NAME INLINE PROPS SUMMARIZER) &rest BODY)"
+  (declare (indent defun))
   (let* ((sym (intern (concat "ibuffer-make-column-"
                              (symbol-name symbol))))
         (bod-1 `(with-current-buffer buffer
@@ -126,7 +127,6 @@
            ;; summary.
            `(put (quote ,sym) 'ibuffer-column-summary nil))
        :autoload-end)))
-;; (put 'define-ibuffer-column 'lisp-indent-function 'defun)
 
 ;;;###autoload
 (defmacro* define-ibuffer-sorter (name documentation
@@ -143,6 +143,7 @@
 value if and only if `a' is \"less than\" `b'.
 
 \(fn NAME DOCUMENTATION (&key DESCRIPTION) &rest BODY)"
+  (declare (indent 1))
   `(progn
      (defun ,(intern (concat "ibuffer-do-sort-by-" (symbol-name name))) ()
        ,(or documentation "No :documentation specified for this sorting 
method.")
@@ -157,7 +158,6 @@
                     ,@body))
           ibuffer-sorting-functions-alist)
      :autoload-end))
-;; (put 'define-ibuffer-sorter 'lisp-indent-function 1)
 
 ;;;###autoload
 (defmacro* define-ibuffer-op (op args
@@ -202,6 +202,7 @@
 macro for exactly what it does.
 
 \(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS 
OPSTRING ACTIVE-OPSTRING COMPLEX) &rest BODY)"
+  (declare (indent 2))
   `(progn
     (defun ,(intern (concat (if (string-match "^ibuffer-do" (symbol-name op))
                                "" "ibuffer-do-") (symbol-name op)))
@@ -212,7 +213,7 @@
      ,(if (not (null interactive))
          `(interactive ,interactive)
        '(interactive))
-     (assert (eq major-mode 'ibuffer-mode))
+       (assert (derived-mode-p 'ibuffer-mode))
      (setq ibuffer-did-modification nil)
      (let ((marked-names  (,(case mark
                              (:deletion
@@ -261,7 +262,6 @@
                 ,body)
            body))))
     :autoload-end))
-;; (put 'define-ibuffer-op 'lisp-indent-function 2)
 
 ;;;###autoload
 (defmacro* define-ibuffer-filter (name documentation
@@ -280,10 +280,11 @@
 bound to the current value of the filter.
 
 \(fn NAME DOCUMENTATION (&key READER DESCRIPTION) &rest BODY)"
+  (declare (indent 2))
   (let ((fn-name (intern (concat "ibuffer-filter-by-" (symbol-name name)))))
     `(progn
        (defun ,fn-name (qualifier)
-        ,(concat (or documentation "This filter is not documented."))
+        ,(or documentation "This filter is not documented.")
         (interactive (list ,reader))
         (ibuffer-push-filter (cons ',name qualifier))
         (message "%s"
@@ -296,7 +297,6 @@
                       ,@body))
             ibuffer-filtering-alist)
        :autoload-end)))
-;; (put 'define-ibuffer-filter 'lisp-indent-function 2)
 
 (provide 'ibuf-macs)