diff options
author | Glenn Morris <rgm@gnu.org> | 2014-06-08 00:41:27 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2014-06-08 00:41:27 -0700 |
commit | 99d8aedf0d6ab3fff025f72daf1f9bd28b07a8d2 (patch) | |
tree | 98f15969887d9453ae88fd66eb4d1d1fa3eafa01 /lisp | |
parent | b6542afeae56abe6b20019df63b76539728fca54 (diff) | |
download | emacs-99d8aedf0d6ab3fff025f72daf1f9bd28b07a8d2.tar.gz |
Doc edits re uniquify
* doc/emacs/buffers.texi (Uniquify): Copyedits.
* doc/emacs/files.texi (Visiting): Update for uniquify changes.
* doc/lispref/files.texi (Subroutines of Visiting): Mention uniquify.
* doc/misc/vip.texi (Files): Defer to Emacs manual for uniquify details.
* lisp/bookmark.el (bookmark-load): Doc fix.
* lisp/uniquify.el (uniquify-buffer-name-style): Doc fix.
* lisp/files.el: Comment.
* etc/NEWS: Related edit.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/bookmark.el | 3 | ||||
-rw-r--r-- | lisp/files.el | 2 | ||||
-rw-r--r-- | lisp/uniquify.el | 30 |
4 files changed, 25 insertions, 15 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6e89afc6715..66afe67a614 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-08 Glenn Morris <rgm@gnu.org> + + * bookmark.el (bookmark-load): + * uniquify.el (uniquify-buffer-name-style): Doc fixes. + 2014-06-06 Juri Linkov <juri@jurta.org> * desktop.el: Activate auto-saving on window configuration changes. diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 5307cada0ac..eab2ea7144f 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -1420,8 +1420,7 @@ explicitly. If you load a file containing bookmarks with the same names as bookmarks already present in your Emacs, the new bookmarks will get -unique numeric suffixes \"<2>\", \"<3>\", ... following the same -method buffers use to resolve name collisions." +unique numeric suffixes \"<2>\", \"<3>\", etc." (interactive (list (read-file-name (format "Load bookmarks from: (%s) " diff --git a/lisp/files.el b/lisp/files.el index 2e66a303dc6..718421b1899 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1654,6 +1654,8 @@ killed." (let (kill-buffer-query-functions kill-buffer-hook) (kill-buffer obuf)))))) +;; FIXME we really need to fold the uniquify stuff in here by default, +;; not using advice, and add it to the doc string. (defun create-file-buffer (filename) "Create a suitably named buffer for visiting FILENAME, and return it. FILENAME (sans directory) is used unchanged if that name is free; diff --git a/lisp/uniquify.el b/lisp/uniquify.el index 5d973c72897..f0e86dc544f 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -26,7 +26,7 @@ ;;; Commentary: -;; Emacs's standard method for making buffer names unique adds <2>, <3>, +;; Emacs's traditional method for making buffer names unique adds <2>, <3>, ;; etc. to the end of (all but one of) the buffers. This file replaces ;; that behavior, for buffers visiting files and dired buffers, with a ;; uniquification that adds parts of the file name until the buffer names @@ -94,23 +94,27 @@ (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'. -For example, files `/foo/bar/mumble/name' and `/baz/quux/mumble/name' + "How to construct unique buffer names for files with the same base name. +The value can be one of: `forward', `reverse', `post-forward', +`post-forward-angle-brackets', or nil. + +For example, the files `/foo/bar/mumble/name' and `/baz/quux/mumble/name' would have the following buffer names in the various styles: - forward bar/mumble/name quux/mumble/name - reverse name\\mumble\\bar name\\mumble\\quux - post-forward name|bar/mumble name|quux/mumble - post-forward-angle-brackets name<bar/mumble> name<quux/mumble> - nil name name<2> -Of course, the \"mumble\" part may be stripped as well, depending on the setting -of `uniquify-strip-common-suffix'." + + forward bar/mumble/name quux/mumble/name + reverse name\\mumble\\bar name\\mumble\\quux + post-forward name|bar/mumble name|quux/mumble + post-forward-angle-brackets name<bar/mumble> name<quux/mumble> + nil name name<2> + +The \"mumble\" part may be stripped as well, depending on the +setting of `uniquify-strip-common-suffix'. For more options that +you can set, browse the `uniquify' custom group." :type '(radio (const forward) (const reverse) (const post-forward) (const post-forward-angle-brackets) - (const :tag "standard Emacs behavior (nil)" nil)) + (const :tag "numeric suffixes" nil)) :version "24.4" :require 'uniquify :group 'uniquify) |