# define DEF_BDIR ".,c:/tmp,~/tmp,~/"
# else
-# define DEF_BDIR ".,~/tmp,~/" /* default for 'backupdir' */
-+# define DEF_BDIR "~/tmp,/var/state/vim" /* default for 'backupdir' */
++# define DEF_BDIR ".,~/tmp,/var/lib/vim" /* default for 'backupdir' */
# endif
#endif
# define DEF_DIR ".,~/tmp,c:/tmp,/tmp"
# else
-# define DEF_DIR ".,~/tmp,/var/tmp,/tmp" /* default for 'directory' */
-+# define DEF_DIR "~/tmp,/var/state/vim,/var/tmp,/tmp" /* default for 'directory' */
++# define DEF_DIR ".,~/tmp,/var/lib/vim,/var/tmp,/tmp" /* default for 'directory' */
# endif
#endif
# define MAKEEF "vim##.err"
#else
-# define MAKEEF "/tmp/vim##.err"
-+# define MAKEEF "~/tmp/vim##.err,/var/state/vim/vim##.err"
++# define MAKEEF "~/tmp/vim##.err"
#endif
#ifdef OS2