[Emacs-diffs] Changes to emacs/lisp/icomplete.el,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/11/28 09:22:13

Index: icomplete.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/icomplete.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- icomplete.el        24 Sep 2006 13:48:59 -0000      1.40
+++ icomplete.el        28 Nov 2006 09:22:13 -0000      1.41
@@ -216,7 +216,7 @@
   "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 @@
   "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