From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 21 Jan 2002 21:33:33 +0000 (+0000)
Subject: Don't require ibuf-ext at load time.
X-Git-Tag: ttn-vms-21-2-B4~17034
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b2977e461a9aad99725d1dd81fe7ec4a3349e48;p=emacs.git

Don't require ibuf-ext at load time.
(ibuffer): Require ibuf-ext here.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f45da8fa8af..47b3e1de0a4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-21  Richard M. Stallman  <rms@gnu.org>
+
+	* ibuffer.el: Don't require ibuf-ext at load time.
+	(ibuffer): Require ibuf-ext here.
+
 2002-01-21  Francesco Potorti`  <pot@gnu.org>
 
 	* generic-x.el (apache-conf-generic-mode): Highlight the first
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 6cade5ae752..4de63a51dba 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -36,9 +36,6 @@
   (require 'ibuf-macs)
   (require 'dired))
 
-;; This is loaded lazily, via byte-compile-dynamic
-(require 'ibuf-ext)
-
 ;;; Compatibility
 (eval-and-compile
   (if (fboundp 'window-list)
@@ -1884,6 +1881,11 @@ Optional argument NOSELECT means don't select the Ibuffer buffer.
 Optional argument SHRINK means shrink the buffer to minimal size.  The
 special value `onewindow' means always use another window."
   (interactive "P")
+
+  ;; The individual functions are lazy-loaded, via byte-compile-dynamic,
+  ;; so we may as well load the file unconditionally now.
+  (require 'ibuf-ext)
+
   (when ibuffer-use-other-window
     (setq other-window-p (not other-window-p)))
   (let* ((buf (get-buffer-create (or name "*Ibuffer*")))