Commit 1861d5a7 authored by Daniel Colascione's avatar Daniel Colascione
Browse files

completion-in-region-mode improvements

parent f9d45267
2014-03-30 Daniel Colascione <dancol@dancol.org>
* 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 <rgm@gnu.org> 2014-03-29 Glenn Morris <rgm@gnu.org>
   
* textmodes/reftex.el: Manage most autoloads automatically. * textmodes/reftex.el: Manage most autoloads automatically.
......
...@@ -1769,6 +1769,12 @@ If the Comint is Lucid Common Lisp, ...@@ -1769,6 +1769,12 @@ If the Comint is Lucid Common Lisp,
Similarly for Soar, Scheme, etc." Similarly for Soar, Scheme, etc."
(interactive) (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. ;; Note that the input string does not include its terminal newline.
(let ((proc (get-buffer-process (current-buffer)))) (let ((proc (get-buffer-process (current-buffer))))
(if (not proc) (user-error "Current buffer has no process") (if (not proc) (user-error "Current buffer has no process")
......
...@@ -6580,6 +6580,8 @@ At top-level, as an editor command, this simply beeps." ...@@ -6580,6 +6580,8 @@ At top-level, as an editor command, this simply beeps."
(deactivate-mark)) (deactivate-mark))
(if (fboundp 'kmacro-keyboard-quit) (if (fboundp 'kmacro-keyboard-quit)
(kmacro-keyboard-quit)) (kmacro-keyboard-quit))
(when completion-in-region-mode
(completion-in-region-mode -1))
(setq defining-kbd-macro nil) (setq defining-kbd-macro nil)
(let ((debug-on-quit nil)) (let ((debug-on-quit nil))
(signal 'quit nil))) (signal 'quit nil)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment