"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
"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