aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-04-05 17:19:42 -0400
committerChong Yidong2011-04-05 17:19:42 -0400
commit41ea9e48373c689eae6a72684a4d26d5ccd41af0 (patch)
tree0248ae0126e8d45f39ec14a99e7f36fc2dda1d82
parent33256f149ff9e346ea4514cf9e454760116c7b8e (diff)
downloademacs-41ea9e48373c689eae6a72684a4d26d5ccd41af0.tar.gz
emacs-41ea9e48373c689eae6a72684a4d26d5ccd41af0.zip
Remove extraneous messages in 2011-03-30 completion change.
These blocked the minibuffer contents when completing in the minibuffer, in a departure from previous Emacs behavior. * lisp/minibuffer.el (completion-in-region--postch) (completion-in-region-mode): Remove unnecessary messages.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/minibuffer.el7
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76a9923e7a0..e98451a6909 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-04-05 Chong Yidong <cyd@stupidchicken.com>
2
3 * minibuffer.el (completion-in-region--postch)
4 (completion-in-region-mode): Remove unnecessary messages.
5
12011-04-05 Juanma Barranquero <lekktu@gmail.com> 62011-04-05 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * font-lock.el (font-lock-refresh-defaults): 8 * font-lock.el (font-lock-refresh-defaults):
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 83358ba2f01..19084aad5d6 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1278,7 +1278,6 @@ Point needs to be somewhere between START and END."
1278;; - pcomplete: pop it down on SPC or after some time-delay. 1278;; - pcomplete: pop it down on SPC or after some time-delay.
1279;; - semantic: use a post-command-hook check similar to this one. 1279;; - semantic: use a post-command-hook check similar to this one.
1280(defun completion-in-region--postch () 1280(defun completion-in-region--postch ()
1281 (message "completion-in-region--postch: cmd=%s" this-command)
1282 (or unread-command-events ;Don't pop down the completions in the middle of 1281 (or unread-command-events ;Don't pop down the completions in the middle of
1283 ;mouse-drag-region/mouse-set-point. 1282 ;mouse-drag-region/mouse-set-point.
1284 (and completion-in-region--data 1283 (and completion-in-region--data
@@ -1310,10 +1309,8 @@ Point needs to be somewhere between START and END."
1310 (delq (assq 'completion-in-region-mode minor-mode-overriding-map-alist) 1309 (delq (assq 'completion-in-region-mode minor-mode-overriding-map-alist)
1311 minor-mode-overriding-map-alist)) 1310 minor-mode-overriding-map-alist))
1312 (if (null completion-in-region-mode) 1311 (if (null completion-in-region-mode)
1313 (progn 1312 (unless (equal "*Completions*" (buffer-name (window-buffer)))
1314 (unless (equal "*Completions*" (buffer-name (window-buffer))) 1313 (minibuffer-hide-completions))
1315 (minibuffer-hide-completions))
1316 (message "Leaving completion-in-region-mode"))
1317 ;; (add-hook 'pre-command-hook #'completion-in-region--prech) 1314 ;; (add-hook 'pre-command-hook #'completion-in-region--prech)
1318 (add-hook 'post-command-hook #'completion-in-region--postch) 1315 (add-hook 'post-command-hook #'completion-in-region--postch)
1319 (push `(completion-in-region-mode . ,completion-in-region-mode-map) 1316 (push `(completion-in-region-mode . ,completion-in-region-mode-map)