masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 11:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.

Browse source
This commit is contained in:
Glenn Morris 2011-05-12 00:07:06 -07:00
commit d2fc7e3d0f
14 changed files with 143 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/emacs-lisp/lisp.el
View file

@ -636,8 +636,8 @@ considered."
(plist (nthcdr 3 data)))
(if (null data)
(minibuffer-message "Nothing to complete")
(let ((completion-annotate-function
(plist-get plist :annotate-function)))
(let ((completion-annotate-function
(plist-get plist :annotation-function)))
(completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)
(plist-get plist :predicate))))))
@ -685,7 +685,7 @@ considered."
(when end
(list beg end obarray
:predicate predicate
:annotate-function
:annotation-function
(unless (eq predicate 'fboundp)
(lambda (str) (if (fboundp (intern-soft str)) " <f>"))))))))