margins: re-order the editor margins

(integrated from trunk branch change 12e9a7d by Todd Whiteman <toddw@activestate.com>)