changeset 102102:0d562146f921

Require comint at top level to fix the last patch.
author Sam Steingold <sds@gnu.org>
date Wed, 18 Feb 2009 15:37:40 +0000
parents 93915a70e1a4
children 175782f3fc48
files lisp/ChangeLog lisp/progmodes/compile.el
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Feb 18 12:55:35 2009 +0000
+++ b/lisp/ChangeLog	Wed Feb 18 15:37:40 2009 +0000
@@ -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
--- a/lisp/progmodes/compile.el	Wed Feb 18 12:55:35 2009 +0000
+++ b/lisp/progmodes/compile.el	Wed Feb 18 15:37:40 2009 +0000
@@ -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 @@
   (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)