diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-04 12:37:56 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-04 12:37:56 -0700 |
| commit | 3e9fa60a5c99568817a12a1011b0e61cce5d3a67 (patch) | |
| tree | 831a801351db662f324d0709bf1fee718eda63e9 /lisp/cedet/ede.el | |
| parent | bbdcf64f499636ba9567e8fed8f209e06380352c (diff) | |
| parent | 61febcb6e32860575316b8a539a2e9f13f70e3c2 (diff) | |
Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert@cs.ucla.edu
Diffstat (limited to 'lisp/cedet/ede.el')
| -rw-r--r-- | lisp/cedet/ede.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index 998df78735a..a9a53d776e2 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -100,7 +100,7 @@ target willing to take the file. 'never means never perform the check." If the value is t, EDE may search in any directory. If the value is a function, EDE calls that function with one -argument, the directory name; the function should return t iff +argument, the directory name; the function should return t if EDE should look for project files in the directory. Otherwise, the value should be a list of fully-expanded directory @@ -704,7 +704,7 @@ Otherwise, create a new project for DIR." "Check if DIR should be in `ede-project-directories'. If it is not, try asking the user if it should be added; if so, add it and save `ede-project-directories' via Customize. -Return nil iff DIR should not be in `ede-project-directories'." +Return nil if DIR should not be in `ede-project-directories'." (setq dir (directory-file-name (expand-file-name dir))) ; strip trailing / (or (eq ede-project-directories t) (and (functionp ede-project-directories) |