"Change add-file-local-variable-prop-line" to "add-file-local-variable" in "mplayer-quit-mplayer". Local variables in end of a file is nicer.
Merge branch 'sessions' into pauseskip. (get "add-file-local-variable"-changes)