From 5b2977e461a9aad99725d1dd81fe7ec4a3349e48 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 21 Jan 2002 21:33:33 +0000 Subject: [PATCH] Don't require ibuf-ext at load time. (ibuffer): Require ibuf-ext here. --- lisp/ChangeLog | 5 +++++ lisp/ibuffer.el | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) 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 + + * ibuffer.el: Don't require ibuf-ext at load time. + (ibuffer): Require ibuf-ext here. + 2002-01-21 Francesco Potorti` * 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*"))) -- 2.39.5