summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-09-29 20:48:31 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-09-29 20:48:31 -0400
commita19f0977a96ee74b96410b41a8ea793c86f64b58 (patch)
tree4a57254f896666d566871fae44b1b090a25c0650
parent73486689523ba42c04c006e6840f7f5f18deb016 (diff)
downloademacs-a19f0977a96ee74b96410b41a8ea793c86f64b58.tar.gz
* lisp/minibuffer.el (completion-at-point): Emit warning for ill-behaved
completion functions.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/minibuffer.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 003018d88d7..31e4e9d10f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-30 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * minibuffer.el (completion-at-point): Emit warning for ill-behaved
+ completion functions.
+
2014-09-29 Stefan Monnier <monnier@iro.umontreal.ca>
* ses.el (ses--letref): Quote value before it gets re-evaluated.
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index f998843cd85..fb74af2e0df 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2106,7 +2106,11 @@ The completion method is determined by `completion-at-point-functions'."
(completion-in-region start end collection
(plist-get plist :predicate))))
;; Maybe completion already happened and the function returned t.
- (_ (cdr res)))))
+ (_
+ (when (cdr res)
+ (message "Warning: %S failed to return valid completion data!"
+ (car res)))
+ (cdr res)))))
(defun completion-help-at-point ()
"Display the completions on the text around point.