diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/cedet/semantic.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/cedet/semantic.el')
| -rw-r--r-- | lisp/cedet/semantic.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el index 290cd907beb..a9af84af3d4 100644 --- a/lisp/cedet/semantic.el +++ b/lisp/cedet/semantic.el @@ -1191,7 +1191,7 @@ This function can be used by `completion-at-point-functions'." (defun semantic-analyze-notc-completion-at-point-function () "Return possible analysis completions at point. The completions provided are via `semantic-analyze-possible-completions', -but with the 'no-tc option passed in, which means constraints based +but with the `no-tc' option passed in, which means constraints based on what is being assigned to are ignored. This function can be used by `completion-at-point-functions'." (when (semantic-active-p) @@ -1207,7 +1207,7 @@ This function can be used by `completion-at-point-functions'." (defun semantic-analyze-nolongprefix-completion-at-point-function () "Return possible analysis completions at point. The completions provided are via `semantic-analyze-possible-completions', -but with the 'no-tc and 'no-longprefix option passed in, which means +but with the `no-tc' and `no-longprefix' option passed in, which means constraints resulting in a long multi-symbol dereference are ignored. This function can be used by `completion-at-point-functions'." (when (semantic-active-p) |