changes to emacs for ibuffer.el installation

[Colin Walters]

Richard had many suggestions for ibuffer.el for its installation into
Emacs; a substantial number of things have been changed.  It has
improved quite a lot, I think.

So, please find the current version attached, which I would like to
install.  I had to change a few bits in lisp/{bindings,loadup}.el,
lisp/emacs-lisp/{autoload,lisp-mode}.el, as well as src/puresize.h
(unfortunately), so I've placed those as a separate patch.

Does anyone have any major objections to installing this and moving
buff-menu.el to lisp/obsolete/?

Index: lisp/bindings.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/bindings.el,v
retrieving revision 1.94
diff -u -r1.94 bindings.el
--- lisp/bindings.el    5 Dec 2001 15:36:44 -0000       1.94
+++ lisp/bindings.el    12 Dec 2001 00:03:21 -0000
@@ -981,6 +981,7 @@
 ;; (define-key ctl-x-map "\-" 'inverse-add-global-abbrev)
 (define-key esc-map "'" 'abbrev-prefix-mark)
 (define-key ctl-x-map "'" 'expand-abbrev)
+(define-key ctl-x-map "\C-b" 'ibuffer-list-buffers)
 
 (define-key ctl-x-map "z" 'repeat)

Index: lisp/loadup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/loadup.el,v
retrieving revision 1.115
diff -u -r1.115 loadup.el
--- lisp/loadup.el      9 Oct 2001 11:21:59 -0000       1.115
+++ lisp/loadup.el      12 Dec 2001 00:03:44 -0000
@@ -145,7 +145,7 @@
     (progn
       (load "vmsproc")))
 (load "abbrev")
-(load "buff-menu")
+(load "ibuffer")
 (if (eq system-type 'vax-vms)
     (progn
       (load "vms-patch")))
Index: lisp/emacs-lisp/autoload.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/autoload.el,v
retrieving revision 1.85
diff -u -r1.85 autoload.el
--- lisp/emacs-lisp/autoload.el 4 Dec 2001 07:09:26 -0000       1.85
+++ lisp/emacs-lisp/autoload.el 12 Dec 2001 00:04:02 -0000
@@ -72,6 +72,9 @@
     (cond
      ;; For complex cases, try again on the macro-expansion.
      ((and (memq car '(easy-mmode-define-global-mode
+                      define-ibuffer-column define-ibuffer-filter
+                      define-ibuffer-sorter
+                      define-ibuffer-op
                       easy-mmode-define-minor-mode define-minor-mode))
           (setq expand (let ((load-file-name file)) (macroexpand form)))
           (eq (car expand) 'progn)
Index: lisp/emacs-lisp/lisp-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/lisp-mode.el,v
retrieving revision 1.132
diff -u -r1.132 lisp-mode.el
--- lisp/emacs-lisp/lisp-mode.el        4 Dec 2001 07:09:47 -0000       1.132
+++ lisp/emacs-lisp/lisp-mode.el        12 Dec 2001 00:04:12 -0000
@@ -132,7 +132,9 @@
 (put 'define-generic-mode 'doc-string-elt 7)
 ;; define-global-mode has no explicit docstring.
 (put 'easy-mmode-define-global-mode 'doc-string-elt 0)
-
+(put 'define-ibuffer-filter 'doc-string-elt 3)
+(put 'define-ibuffer-op 'doc-string-elt 3)
+(put 'define-ibuffer-sorter 'doc-string-elt 3)
 
 (defun lisp-font-lock-syntactic-face-function (state)
   (if (nth 3 state)
Index: src/puresize.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/puresize.h,v
retrieving revision 1.59
diff -u -r1.59 puresize.h
--- src/puresize.h      18 Nov 2001 10:59:49 -0000      1.59
+++ src/puresize.h      12 Dec 2001 00:27:01 -0000
@@ -42,7 +42,7 @@
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (750000 + SYSTEM_PURESIZE_EXTRA + 
SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (800000 + SYSTEM_PURESIZE_EXTRA + 
SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */

ibuffer.el
Description: ibuffer.el

ibuf-ext.el
Description: ibuf-ext.el

ibuf-macs.el
Description: ibuf-macs.el