[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116908: completion-in-region-mode improvements
From: |
Daniel Colascione |
Subject: |
[Emacs-diffs] trunk r116908: completion-in-region-mode improvements |
Date: |
Sun, 30 Mar 2014 19:13:07 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116908
revision-id: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Sun 2014-03-30 12:12:57 -0700
message:
completion-in-region-mode improvements
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/comint.el comint.el-20091113204419-o5vbwnq5f7feedwu-149
lisp/simple.el simple.el-20091113204419-o5vbwnq5f7feedwu-403
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-03-29 00:53:32 +0000
+++ b/lisp/ChangeLog 2014-03-30 19:12:57 +0000
@@ -1,3 +1,12 @@
+2014-03-30 Daniel Colascione <address@hidden>
+
+ * comint.el (comint-send-input): Deactivate
+ completion-in-region-mode before we send comint input.
+ (Bug#17139).
+
+ * simple.el (keyboard-quit): Deactivate completion-in-region-mode
+ on keyboard-quit.
+
2014-03-29 Glenn Morris <address@hidden>
* textmodes/reftex.el: Manage most autoloads automatically.
=== modified file 'lisp/comint.el'
--- a/lisp/comint.el 2014-03-22 22:12:52 +0000
+++ b/lisp/comint.el 2014-03-30 19:12:57 +0000
@@ -1769,6 +1769,12 @@
Similarly for Soar, Scheme, etc."
(interactive)
+ ;; If we're currently completing, stop. We're definitely done
+ ;; completing, and by sending the input, we might cause side effects
+ ;; that will confuse the code running in the completion
+ ;; post-command-hook.
+ (when completion-in-region-mode
+ (completion-in-region-mode -1))
;; Note that the input string does not include its terminal newline.
(let ((proc (get-buffer-process (current-buffer))))
(if (not proc) (user-error "Current buffer has no process")
=== modified file 'lisp/simple.el'
--- a/lisp/simple.el 2014-03-28 16:26:15 +0000
+++ b/lisp/simple.el 2014-03-30 19:12:57 +0000
@@ -6580,6 +6580,8 @@
(deactivate-mark))
(if (fboundp 'kmacro-keyboard-quit)
(kmacro-keyboard-quit))
+ (when completion-in-region-mode
+ (completion-in-region-mode -1))
(setq defining-kbd-macro nil)
(let ((debug-on-quit nil))
(signal 'quit nil)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116908: completion-in-region-mode improvements,
Daniel Colascione <=