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

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

2 files changed, 2 insertions, 1 deletions

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