Require comint at top level to fix the last patch.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8221ab..c64ad36 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-18  Sam Steingold  <sds@gnu.org>
+
+       * progmodes/compile.el: Require comint at top level to fix the
+       last patch.
+
 2009-02-18  Martin Rudalics  <rudalics@gmx.at>
 
        * cus-edit.el (custom-group-value-create): Don't throw an error

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 47b2128..00bd33b 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -72,6 +72,7 @@
 
 (eval-when-compile (require 'cl))
 (require 'tool-bar)
+(require 'comint)
 
 (defvar font-lock-extra-managed-props)
 (defvar font-lock-keywords)
@@ -1155,7 +1156,7 @@ Returns the compilation buffer created."
   (or mode (setq mode 'compilation-mode))
   (let* ((name-of-mode
          (if (eq mode t)
-             (prog1 "compilation" (require 'comint))
+             "compilation"
            (replace-regexp-in-string "-mode$" "" (symbol-name mode))))
         (thisdir default-directory)
         outwin outbuf)