[Emacs-diffs] trunk r115473: * lisp/uniquify.el (uniquify-buffer-name-style): Change default to `post-forward-angle-brackets'.

[Juri Linkov]

------------------------------------------------------------
revno: 115473
revision-id: address@hidden
parent: address@hidden
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-12-12 02:42:16 +0200
message:
  * 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
modified:
  doc/emacs/buffers.texi         
buffers.texi-20091113204419-o5vbwnq5f7feedwu-6234
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/menu-bar.el               menubar.el-20091113204419-o5vbwnq5f7feedwu-546
  lisp/uniquify.el               uniquify.el-20091113204419-o5vbwnq5f7feedwu-956

=== modified file 'doc/emacs/buffers.texi'
--- a/doc/emacs/buffers.texi    2013-11-29 18:54:14 +0000
+++ b/doc/emacs/buffers.texi    2013-12-12 00:42:16 +0000
@@ -614,8 +614,7 @@
 
 @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

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-12-11 15:59:27 +0000
+++ b/etc/NEWS  2013-12-12 00:42:16 +0000
@@ -205,7 +205,7 @@
 
 ** `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.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-11 21:15:12 +0000
+++ b/lisp/ChangeLog    2013-12-12 00:42:16 +0000
@@ -1,3 +1,11 @@
+2013-12-12  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/package.el (finder-list-matches):

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2013-12-08 06:24:54 +0000
+++ b/lisp/menu-bar.el  2013-12-12 00:42:16 +0000
@@ -1223,10 +1223,9 @@
        "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)

=== modified file 'lisp/uniquify.el'
--- a/lisp/uniquify.el  2013-11-29 18:36:31 +0000
+++ b/lisp/uniquify.el  2013-12-12 00:42:16 +0000
@@ -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 @@
                (const post-forward)
                (const post-forward-angle-brackets)
                (const :tag "standard Emacs behavior (nil)" nil))
+  :version "24.4"
   :require 'uniquify
   :group 'uniquify)