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.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/ede.el')
-rw-r--r-- | lisp/cedet/ede.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index 76ec3567c63..2a522bcccd8 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -81,12 +81,12 @@ "Whether a new source file should be automatically added to a target. Whenever a new file is encountered in a directory controlled by a project file, all targets are queried to see if it should be added. -If the value is 'always, then the new file is added to the first -target encountered. If the value is 'multi-ask, then if more than one +If the value is `always', then the new file is added to the first +target encountered. If the value is `multi-ask', then if more than one target wants the file, the user is asked. If only one target wants the file, then it is automatically added to that target. If the -value is 'ask, then the user is always asked, unless there is no -target willing to take the file. 'never means never perform the check." +value is `ask', then the user is always asked, unless there is no +target willing to take the file. `never' means never perform the check." :group 'ede :type '(choice (const always) (const multi-ask) |