From: Kim F. Storm <storm@cua.dk>
Date: Tue, 28 Nov 2006 09:22:13 +0000 (+0000)
Subject: (icomplete-tidy, icomplete-exhibit): Check that
X-Git-Tag: emacs-pretest-22.0.92~413
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fe689fb6615bc61d6733a413a5697af437630207;p=emacs.git

(icomplete-tidy, icomplete-exhibit): Check that
icomplete-mode is enabled.
---

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 6687c13275b..8c1ee3ad64c 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -216,7 +216,7 @@ Usually run by inclusion in `minibuffer-setup-hook'."
   "Remove completions display \(if any) prior to new user input.
 Should be run in on the minibuffer `pre-command-hook'.  See `icomplete-mode'
 and `minibuffer-setup-hook'."
-  (when icomplete-eoinput
+  (when (and icomplete-mode icomplete-eoinput)
 
     (unless (>= icomplete-eoinput (point-max))
       (let ((buffer-undo-list t)) ; prevent entry
@@ -230,7 +230,7 @@ and `minibuffer-setup-hook'."
   "Insert icomplete completions display.
 Should be run via minibuffer `post-command-hook'.  See `icomplete-mode'
 and `minibuffer-setup-hook'."
-  (when (icomplete-simple-completing-p)
+  (when (and icomplete-mode (icomplete-simple-completing-p))
     (save-excursion
       (goto-char (point-max))
       ;; Register the end of input, so we know where the extra stuff