* lisp/loadup.el: Preload "uniquify".

* lisp/uniquify.el (uniquify-buffer-name-style): Change default.
* src/lisp.mk (lisp): Add uniquify.elc.

6 files changed, 10 insertions, 2 deletions

diff --git a/etc/NEWS b/etc/NEWS
index febc367c6d9..0bcd13af3eb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -205,6 +205,8 @@ Czech typography rules.  To globally enable this feature, evaluate:
 
 ** `electric-indent-mode' is enabled by default.
 
+** Uniquify is enabled by default.
+
 ** Command `rectangle-mark-mode' bound to C-x SPC makes a rectangular region.
 Most commands are still unaware of it, but kill/yank do work on the rectangle.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a8043feeba..b40773904bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2013-11-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * uniquify.el (uniquify-buffer-name-style): Change default.
+
+        * loadup.el: Preload "uniquify".
+
         * time.el (display-time-update): Update all mode lines (bug#15999).
 
         * electric.el (electric-indent-mode): Enable by default.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index aececad804f..b72ddc0955b 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -280,6 +280,7 @@
 
 (load "vc/vc-hooks")
 (load "vc/ediff-hook")
+(load "uniquify")
 (load "electric")
 (if (not (eq system-type 'ms-dos)) (load "tooltip"))
 
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 546796b619a..b7bb4c73879 100644
--- 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'.
diff --git a/src/ChangeLog b/src/ChangeLog
index 0810d083f33..02a3f4eb21d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,7 +4,7 @@
         (redisplay_internal): Use it (bug#15999).
         (prepare_menu_bars, redisplay_window): Use it as well.
 
-        * lisp.mk (lisp): Add electric.elc.
+        * lisp.mk (lisp): Add electric.elc and uniquify.elc.
 
 2013-11-29  Tom Seddon  <emacs@tomseddon.plus.com>  (tiny change)
 
diff --git a/src/lisp.mk b/src/lisp.mk
index 72ada45c5e4..d61f7f71c2f 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -165,6 +165,7 @@ lisp = \
         $(lispsource)/vc/vc-hooks.elc \
         $(lispsource)/vc/ediff-hook.elc \
         $(lispsource)/electric.elc \
+        $(lispsource)/uniquify.elc \
         $(lispsource)/tooltip.elc