Changed macros to snippets and made them wrap a potential selection. Changed: D trunk/Defaults.tmbundle/Macros/Smart Escape-Quote \"\".plist D trunk/Defaults.tmbundle/Macros/Smart Escape-Single-Quote \'\'.plist A trunk/Defaults.tmbundle/Snippets/Smart Escape-Quote \"\".plist A trunk/Defaults.tmbundle/Snippets/Smart Escape-Single-Quote \'\'.plist