summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2007-03-10 19:23:29 +0000
committerEli Zaretskii <eliz@gnu.org>2007-03-10 19:23:29 +0000
commit7a78ffeca93b7d2026e30ccbe57a66778b14f846 (patch)
treeceaed8030fbe46f4b70d049cc550caf1f56b47d5
parente5319d36db0ce34253b7a76b05e076d7d1a69b03 (diff)
downloademacs-7a78ffeca93b7d2026e30ccbe57a66778b14f846.tar.gz
(icomplete-tidy, icomplete-exhibit): Bind deactivate-mark to nil.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/icomplete.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2029538256b..94f76541c06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-10 Johan Bockg,be(Brd <bojohan@dd.chalmers.se>
+
+ * icomplete.el (icomplete-tidy, icomplete-exhibit): Bind
+ deactivate-mark to nil.
+
2007-03-10 Martin Rudalics <rudalics@gmx.at>
* complete.el (PC-do-completion): Bind dirlength to nil to avoid
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 3ee53a821bf..6599c1442bc 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -219,7 +219,8 @@ and `minibuffer-setup-hook'."
(when (and icomplete-mode icomplete-eoinput)
(unless (>= icomplete-eoinput (point-max))
- (let ((buffer-undo-list t)) ; prevent entry
+ (let ((buffer-undo-list t) ; prevent entry
+ deactivate-mark)
(delete-region icomplete-eoinput (point-max))))
;; Reestablish the safe value.
@@ -256,7 +257,8 @@ and `minibuffer-setup-hook'."
minibuffer-completion-table
minibuffer-completion-predicate
(not minibuffer-completion-confirm)))))
- (buffer-undo-list t))
+ (buffer-undo-list t)
+ deactivate-mark)
;; Do nothing if while-no-input was aborted.
(if (consp text) (insert (car text))))))))