diff options
| author | Glenn Morris | 2010-04-20 00:54:28 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-04-20 00:54:28 -0700 |
| commit | 0ca12598468ccdd32b8dc6c984bfc179b2dd30ad (patch) | |
| tree | 2090afabe87b841d19629414498d0ae5ef3ffac6 | |
| parent | d2c7b917066072d1780dfc8200bd749b3965f835 (diff) | |
| download | emacs-0ca12598468ccdd32b8dc6c984bfc179b2dd30ad.tar.gz emacs-0ca12598468ccdd32b8dc6c984bfc179b2dd30ad.zip | |
* emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 46196e85a65..f0eb059642e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-04-20 Glenn Morris <rgm@gnu.org> | 1 | 2010-04-20 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string. | ||
| 4 | |||
| 3 | * minibuffer.el (completion-at-point): Doc fix. | 5 | * minibuffer.el (completion-at-point): Doc fix. |
| 4 | 6 | ||
| 5 | 2010-04-18 Chong Yidong <cyd@stupidchicken.com> | 7 | 2010-04-18 Chong Yidong <cyd@stupidchicken.com> |
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index da482e715b1..54fa4d615cd 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el | |||
| @@ -627,9 +627,10 @@ considered." | |||
| 627 | (let ((completion-annotate-function (plist-get plist :annotate-function))) | 627 | (let ((completion-annotate-function (plist-get plist :annotate-function))) |
| 628 | (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) | 628 | (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) |
| 629 | (plist-get plist :predicate))))) | 629 | (plist-get plist :predicate))))) |
| 630 | 630 | ||
| 631 | 631 | ||
| 632 | (defun lisp-completion-at-point (&optional predicate) | 632 | (defun lisp-completion-at-point (&optional predicate) |
| 633 | "Function used for `completion-at-point-functions' in `emacs-lisp-mode'." | ||
| 633 | ;; FIXME: the `end' could be after point? | 634 | ;; FIXME: the `end' could be after point? |
| 634 | (let* ((end (point)) | 635 | (let* ((end (point)) |
| 635 | (beg (with-syntax-table emacs-lisp-mode-syntax-table | 636 | (beg (with-syntax-table emacs-lisp-mode-syntax-table |