- Tweak Quick Edit error/feedback strings
- Fix comments to reflect Quick Edit error related API changes
- Fix outdated FileSyncManager docs
Use the correct name of CodeMirror option for tab size.
Remove code that was added based on the wrong assumption of using indentUnit CM option for tab size.
- Fix bug #7300 (Prefs are never saved again after opening folder that
contains the user prefs JSON files in its subtree) - ensure that FileSystem
always knows we've read the JSON file before we try to write to it. We
don't want to enable the 'blind' flag since it will mean we virtually
always overwrite external changes to the prefs file, and we don't want to
start using file watchers to observe external changes on the fly since
we haven't yet deeply tested having multiple watch roots active at once.
- Rename confusing "filename" vars in PreferencesBase
- Fix JSLint errors in ProjectManager from #7026
Merge pull request #7376 from adobe/pflynn/fix-userprefs-writes

Fix bug #7300 (Prefs never saved again after opening ancestor folder of user prefs.json)
Further improve Quck Edit error strings. Break out a new separate case for
cursor pos being ambiguous between two class names.

Fix some more JSDoc typos found in code review.
Revert "Merge pull request #7270 from adobe/dangoor/help-link"

This restores the help menu options to their original, pre-UserVoice configuration

This reverts commit c0eb5be239f16c83e950665c7d63d775ba952855, reversing
changes made to d2b8286a924efe2bc2d71fe4794e17c3d92f2c3a.
Merge pull request #7355 from adobe/rlim/tab-size-issue

Use the correct name of CodeMirror option for tab size.
Merge pull request #7392 from adobe/dangoor/revert-help

Revert the Help menu
Code review: tweak wording of comment
Update CM SHA to cherrypicks for release 38
Merge pull request #7349 from adobe/pflynn/quickedit-error-strings

Tweak Quick Edit error strings & update docs
Merge pull request #7401 from adobe/nj/cm-release-38-cherrypicks

Update CM SHA to cherrypicks for release 38
Merge branch 'master' of https://github.com/adobe/brackets