diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 6 |
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. |