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/ede | |
| 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/ede')
| -rw-r--r-- | lisp/cedet/ede/files.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/ede/locate.el | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el index 4ba823adeee..81a1a6adf2e 100644 --- a/lisp/cedet/ede/files.el +++ b/lisp/cedet/ede/files.el @@ -304,7 +304,7 @@ Do this whenever a new project is created, as opposed to loaded." ;; instead so that -P can be obsoleted. (defun ede-directory-project-p (dir &optional force) "Return a project description object if DIR is in a project. -Optional argument FORCE means to ignore a hash-hit of 'nomatch. +Optional argument FORCE means to ignore a hash-hit of `nomatch'. This depends on an up to date `ede-project-class-files' variable. Any directory that contains the file .ede-ignore will always return nil. diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el index a076c46513c..cee2f8ec419 100644 --- a/lisp/cedet/ede/locate.el +++ b/lisp/cedet/ede/locate.el @@ -100,9 +100,9 @@ based on `ede-locate-setup-options'." (defclass ede-locate-base () ((root :initarg :root :documentation - "The root of these locat searches.") + "The root of these locate searches.") (file :documentation - "The last file search for with EDE locate.") + "The last file searched for with EDE locate.") (lastanswer :documentation "The last answer provided by the locator.") (hash :documentation @@ -245,10 +245,8 @@ variable `cedet-global-command'.") newroot)) (cl-defmethod ede-locate-file-in-project-impl ((loc ede-locate-global) - filesubstring) - "Locate with LOC occurrences of FILESUBSTRING under PROJECTROOT. -Searches are done under the current root of the EDE project -that created this EDE locate object." + filesubstring) + "Locate occurrences of FILESUBSTRING in LOC, using Gnu Global." (require 'cedet-global) (let ((default-directory (oref loc root))) (cedet-gnu-global-expand-filename filesubstring))) |