* lisp/uniquify.el (uniquify-buffer-name-style): Change default to `post-forward-angle-brackets'.

* lisp/menu-bar.el (menu-bar-options-menu): Don't require preloaded `uniquify'.
Change default to `post-forward-angle-brackets'.

http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00317.html

5 files changed, 13 insertions, 6 deletions

diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index 2fadb7b4910..a62f2bdac8d 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -614,8 +614,7 @@ names (all but one of them).
 
 @vindex uniquify-buffer-name-style
   Other methods work by adding parts of each file's directory to the
-buffer name.  To select one, load the library @file{uniquify} (e.g.,
-using @code{(require 'uniquify)}), and customize the variable
+buffer name.  To select one, customize the variable
 @code{uniquify-buffer-name-style} (@pxref{Easy Customization}).
 
   To begin with, the @code{forward} naming method includes part of the
diff --git a/etc/NEWS b/etc/NEWS
index 3957c40dcd0..2941a4855fe 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -205,7 +205,7 @@ Czech typography rules.  To globally enable this feature, evaluate:
 
 ** `electric-indent-mode' is enabled by default.
 
-** Uniquify is enabled by default.
+** Uniquify is enabled by default with post-forward-angle-brackets style.
 
 ** 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 7db22e734cc..7ec6750720b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-12  Juri Linkov  <juri@jurta.org>
+
+        * uniquify.el (uniquify-buffer-name-style): Change default to
+        `post-forward-angle-brackets'.
+
+        * menu-bar.el (menu-bar-options-menu): Don't require preloaded
+        `uniquify'.  Change default to `post-forward-angle-brackets'.
+
 2013-12-11  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/package.el (finder-list-matches):
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 9e267d26c9b..1f9d66f3738 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1223,10 +1223,9 @@ mail status in mode line"))
        "Use Directory Names in Buffer Names"
        "Directory name in buffer names (uniquify) %s"
        "Uniquify buffer names by adding parent directory names"
-       (require 'uniquify)
        (setq uniquify-buffer-name-style
              (if (not uniquify-buffer-name-style)
-                 'forward))))
+                 'post-forward-angle-brackets))))
 
     (bindings--define-key menu [edit-options-separator]
       menu-bar-separator)
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index b7bb4c73879..a52ed613941 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -93,7 +93,7 @@
   :group 'files)
 
 
-(defcustom uniquify-buffer-name-style 'post-forward
+(defcustom uniquify-buffer-name-style 'post-forward-angle-brackets
   "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'.
@@ -111,6 +111,7 @@ of `uniquify-strip-common-suffix'."
                 (const post-forward)
                 (const post-forward-angle-brackets)
                 (const :tag "standard Emacs behavior (nil)" nil))
+  :version "24.4"
   :require 'uniquify
   :group 'uniquify)