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

[Colin Walters]

Index: emacs/lisp/ibuf-macs.el
diff -c emacs/lisp/ibuf-macs.el:1.3 emacs/lisp/ibuf-macs.el:1.4
*** emacs/lisp/ibuf-macs.el:1.3 Sun Feb  3 22:57:35 2002
--- emacs/lisp/ibuf-macs.el     Thu Mar  7 23:03:36 2002
***************
*** 93,106 ****
  `ibuffer-recompile-formats'."
    (let* ((sym (intern (concat "ibuffer-make-column-"
                              (symbol-name symbol))))
!        (bod-2 `(with-current-buffer buffer
                   ,@body))
-        (bod-1 (if summarizer
-                   `(car
-                     (push ,bod-2
-                           ,(intern (format "ibuffer-summary-for-column-%s"
-                                            name))))
-                 bod-2))
         (bod (if props
                 `(propertize
                   ,bod-1
--- 93,100 ----
  `ibuffer-recompile-formats'."
    (let* ((sym (intern (concat "ibuffer-make-column-"
                              (symbol-name symbol))))
!        (bod-1 `(with-current-buffer buffer
                   ,@body))
         (bod (if props
                 `(propertize
                   ,bod-1
***************
*** 116,127 ****
                 name
               (capitalize (symbol-name symbol))))
         ,(if summarizer
            `(put (quote ,sym) 'ibuffer-column-summarizer
                  (quote ,summarizer)))
         ,(if summarizer
!           `(defvar ,(intern (format "ibuffer-summary-for-column-%s"
!                                     name))
!              nil))
         :autoload-end)))
  ;; (put 'define-ibuffer-column 'lisp-indent-function 'defun)
  
--- 110,122 ----
                 name
               (capitalize (symbol-name symbol))))
         ,(if summarizer
+           ;; Store the name of the summarizing function.
            `(put (quote ,sym) 'ibuffer-column-summarizer
                  (quote ,summarizer)))
         ,(if summarizer
!           ;; This will store the actual values of the column
!           ;; summary.
!           `(put (quote ,sym) 'ibuffer-column-summary nil))
         :autoload-end)))
  ;; (put 'define-ibuffer-column 'lisp-indent-function 'defun)