diff options
| author | Eli Zaretskii | 2007-03-10 19:23:29 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2007-03-10 19:23:29 +0000 |
| commit | 7a78ffeca93b7d2026e30ccbe57a66778b14f846 (patch) | |
| tree | ceaed8030fbe46f4b70d049cc550caf1f56b47d5 | |
| parent | e5319d36db0ce34253b7a76b05e076d7d1a69b03 (diff) | |
| download | emacs-7a78ffeca93b7d2026e30ccbe57a66778b14f846.tar.gz emacs-7a78ffeca93b7d2026e30ccbe57a66778b14f846.zip | |
(icomplete-tidy, icomplete-exhibit): Bind deactivate-mark to nil.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/icomplete.el | 6 |
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 @@ | |||
| 1 | 2007-03-10 Johan Bockg,be(Brd <bojohan@dd.chalmers.se> | ||
| 2 | |||
| 3 | * icomplete.el (icomplete-tidy, icomplete-exhibit): Bind | ||
| 4 | deactivate-mark to nil. | ||
| 5 | |||
| 1 | 2007-03-10 Martin Rudalics <rudalics@gmx.at> | 6 | 2007-03-10 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * complete.el (PC-do-completion): Bind dirlength to nil to avoid | 8 | * 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'." | |||
| 219 | (when (and icomplete-mode icomplete-eoinput) | 219 | (when (and icomplete-mode icomplete-eoinput) |
| 220 | 220 | ||
| 221 | (unless (>= icomplete-eoinput (point-max)) | 221 | (unless (>= icomplete-eoinput (point-max)) |
| 222 | (let ((buffer-undo-list t)) ; prevent entry | 222 | (let ((buffer-undo-list t) ; prevent entry |
| 223 | deactivate-mark) | ||
| 223 | (delete-region icomplete-eoinput (point-max)))) | 224 | (delete-region icomplete-eoinput (point-max)))) |
| 224 | 225 | ||
| 225 | ;; Reestablish the safe value. | 226 | ;; Reestablish the safe value. |
| @@ -256,7 +257,8 @@ and `minibuffer-setup-hook'." | |||
| 256 | minibuffer-completion-table | 257 | minibuffer-completion-table |
| 257 | minibuffer-completion-predicate | 258 | minibuffer-completion-predicate |
| 258 | (not minibuffer-completion-confirm))))) | 259 | (not minibuffer-completion-confirm))))) |
| 259 | (buffer-undo-list t)) | 260 | (buffer-undo-list t) |
| 261 | deactivate-mark) | ||
| 260 | ;; Do nothing if while-no-input was aborted. | 262 | ;; Do nothing if while-no-input was aborted. |
| 261 | (if (consp text) (insert (car text)))))))) | 263 | (if (consp text) (insert (car text)))))))) |
| 262 | 264 | ||