Merge Org 8.2.4

[gnu-emacs] / lisp / uniquify.el

diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 2b4794c9cc2540e9f1ddda5edd9b76b3fbdbbfa1..b7bb4c73879649cd21fb0019221899ce58503b9a 100644 (file)
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -1,6 +1,7 @@
 ;;; uniquify.el --- unique buffer names dependent on file name -*- lexical-binding: t -*-
 
-;; Copyright (C) 1989, 1995-1997, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1995-1997, 2001-2013 Free Software Foundation,
+;; Inc.
 
 ;; Author: Dick King <king@reasoning.com>
 ;; Maintainer: FSF
@@ -92,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'.