comparison lisp/minibuffer.el @ 108340:486e3cc1b3a6

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 20 Apr 2010 22:41:29 +0000
parents a7c97cc14b52
children 973b5bc5fcfe 0eedefa853ee
comparison
equal deleted inserted replaced
108339:e88fb053fc02 108340:486e3cc1b3a6
1161 Currently supported properties are: 1161 Currently supported properties are:
1162 `:predicate' a predicate that completion candidates need to satisfy. 1162 `:predicate' a predicate that completion candidates need to satisfy.
1163 `:annotation-function' the value to use for `completion-annotate-function'.") 1163 `:annotation-function' the value to use for `completion-annotate-function'.")
1164 1164
1165 (defun completion-at-point () 1165 (defun completion-at-point ()
1166 "Complete the thing at point according to local mode." 1166 "Complete the thing at point according to local mode.
1167 This runs the hook `completion-at-point-functions' until a member returns
1168 non-nil."
1167 (interactive) 1169 (interactive)
1168 (let ((res (run-hook-with-args-until-success 1170 (let ((res (run-hook-with-args-until-success
1169 'completion-at-point-functions))) 1171 'completion-at-point-functions)))
1170 (cond 1172 (cond
1171 ((functionp res) (funcall res)) 1173 ((functionp res) (funcall res))