Merge Org 8.2.4

[gnu-emacs] / lisp / uniquify.el

diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 546796b619a14f15981bbb447bdb098ebddac814..b7bb4c73879649cd21fb0019221899ce58503b9a 100644 (file)
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -93,7 +93,7 @@
   :group 'files)
 
 
-(defcustom uniquify-buffer-name-style nil
+(defcustom uniquify-buffer-name-style 'post-forward
   "If non-nil, buffer names are uniquified with parts of directory name.
 The value determines the buffer name style and is one of `forward',
 `reverse', `post-forward', or `post-forward-angle-brackets'.