[SVN] missed merge info that didn't commit yesterday for some reason

git-svn-id: file:///var/local/code.tiki.org/tikisvn/branches/12.x@51263 b456876b-0849-0410-b77d-98878d47e9d5
[bp/r51264][FIX] autosave: Depends on feature_warn_on_edit (who knew?) so fix pref dependencies and display an error message (thanks marclaporte)

git-svn-id: file:///var/local/code.tiki.org/tikisvn/branches/12.x@51265 b456876b-0849-0410-b77d-98878d47e9d5