Small doc updates for CUA and dired

* doc/emacs/dired.texi (Misc Dired Features): Copyedits for hide-details.

* lisp/dired.el (dired-hide-details-hide-symlink-targets)
(dired-hide-details-hide-information-lines)
(dired-hide-details-mode): Doc fixes.

* lisp/emulation/cua-base.el (cua-mode): Doc fix.

* etc/NEWS: Related edits.

* lisp/ChangeLog: Comment changes do not need ChangeLog entries.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4d47bdad73ba214ab147df370a9de79d0f16f90e..bac170eaf3a5a6a6144abc7a1fc5afeb11db9432 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
 2014-01-27  Glenn Morris  <rgm@gnu.org>
 
+       * dired.texi (Misc Dired Features): Copyedits for hide-details.
+
        * buffers.texi (List Buffers): Tiny edit.
 
        * calendar.texi (Time Intervals): Update for files in ~/.emacs.d/.

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index b7de1bdf3aac6f6d8e3353782857e045b20bf512..70553c137475a8a3bf93f4c5d9fcf3a909f90ad2 100644 (file)
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1382,7 +1382,7 @@ file, the search wraps around to the first marked file.  The command
 a regular expression search.  @xref{Repeat Isearch}, for information
 about search repetition.
 
-@cindex Adding to the kill ring in Dired.
+@cindex adding to the kill ring in Dired
 @kindex w @r{(Dired)}
 @findex dired-copy-filename-as-kill
   The command @kbd{w} (@code{dired-copy-filename-as-kill}) puts the
@@ -1403,6 +1403,19 @@ names into arguments for other Emacs commands.  It also displays what
 it added to the kill ring, so you can use it to display the list of
 currently marked files in the echo area.
 
+@kindex ( @r{(Dired)}
+@findex dired-hide-details-mode
+@vindex dired-hide-details-hide-symlink-targets
+@vindex dired-hide-details-hide-information-lines
+@cindex hiding details in Dired
+  The command @kbd{(} (@code{dired-hide-details-mode}) toggles whether
+details, such as ownership or file permissions, are visible in the
+current Dired buffer.  By default, it also hides the targets of
+symbolic links, and all lines other than the header line and
+file/directory listings.  To change this, customize the options
+@code{dired-hide-details-hide-symlink-targets} and
+@code{dired-hide-details-hide-information-lines}, respectively.
+
 @cindex Dired and version control
   If the directory you are visiting is under version control
 (@pxref{Version Control}), then the normal VC diff and log commands
@@ -1440,18 +1453,3 @@ it onto a Dired buffer; this either moves, copies, or creates a link
 to the file in that directory.  Precisely which action is taken is
 determined by the originating program.  Dragging files out of a Dired
 buffer is currently not supported.
-
-@kindex ( @r{(Dired)}
-@c )
-@findex dired-hide-details-mode
-@vindex dired-hide-details-hide-symlink-targets
-@vindex dired-hide-details-hide-information-lines
-@cindex Hide details in Dired.
-  The command @kbd{(} (@code{dired-hide-details-mode}) toggles whether
-details, such as ownership or file permissions, are hidden.  If the
-variable @code{dired-hide-details-hide-symlink-targets} is
-non-@code{nil} then targets of symbolic links are hidden as well.  A
-non-@code{nil} value for the variable
-@code{dired-hide-details-hide-information-lines} means that all lines
-other than the header and lines containing files and directories are
-hidden.

diff --git a/etc/NEWS b/etc/NEWS
index 4c31e6280561bd2dfb1b499d40d79c7295a0f9ae..c9981857d6483a8368dad672976297dc212cf7b6 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -432,6 +432,7 @@ For example, this enables parsing of macros which open new namespaces.
 Hence, you can now enable it independently from `transient-mark-mode',
 `delete-selection-mode', and `shift-select-mode'.
 
+---
 *** `cua-highlight-region-shift-only' is now obsolete.
 You can disable `transient-mark-mode' to get the same result.
 
@@ -458,9 +459,8 @@ restoring the frame/window configuration (frameset).  Additional options
 and `desktop-restore-forces-onscreen' offer further customization.
 
 +++
-** Dired
-
-*** New minor mode `dired-hide-details-mode' hides details.
+** New Dired minor mode `dired-hide-details-mode' toggles whether details,
+such as file ownership or permissions, are visible.
 
 ** Eldoc Mode works properly in the minibuffer.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 84d263aa62cfc96999d8f2044cfc780669e9f31c..0399b5e0fe78423b4c38820e765e592b40177b1d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,10 @@
-2014-01-27  Reuben Thomas  <rrt@sc3d.org>
+2014-01-27  Glenn Morris  <rgm@gnu.org>
 
-       * whitespace.el (whitespace-enable-predicate): fix sense of comment.
-       Fixes bug #16564, from change of 2013-03-10.
+       * emulation/cua-base.el (cua-mode): Doc fix.
 
-2014-01-27  Glenn Morris  <rgm@gnu.org>
+       * dired.el (dired-hide-details-hide-symlink-targets)
+       (dired-hide-details-hide-information-lines)
+       (dired-hide-details-mode): Doc fixes.
 
        * shadowfile.el (shadow-info-file, shadow-todo-file): Doc fix.
        * strokes.el (strokes-file): Doc fix.  Bump :version.

diff --git a/lisp/dired.el b/lisp/dired.el
index a30f34bc43a2a0df7120de6bffb3ea2e645ee449..e31912aa3cc26cd299aad28f2dbcf2407d117ac4 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -241,13 +241,13 @@ new Dired buffers."
   :group 'dired)
 
 (defcustom dired-hide-details-hide-symlink-targets t
-  "If non-nil, `dired-hide-details-mode' hides symbolic link targets."
+  "Non-nil means `dired-hide-details-mode' hides symbolic link targets."
   :type 'boolean
   :version "24.4"
   :group 'dired)
 
 (defcustom dired-hide-details-hide-information-lines t
-  "Non-nil means hide lines other than header and file/dir lines."
+  "Non-nil means `dired-hide-details-mode' hides all but header and file lines."
   :type 'boolean
   :version "24.4"
   :group 'dired)
@@ -2267,10 +2267,14 @@ unchanged."
       (substring file (match-end 0))
     file))
 \f
-;;; Minor mode for hiding details
 ;;;###autoload
 (define-minor-mode dired-hide-details-mode
-  "Hide details in Dired mode."
+  "Toggle visibility of detailed information in current Dired buffer.
+When this minor mode is enabled, details such as file ownership and
+permissions are hidden from view.
+
+See options: `dired-hide-details-hide-symlink-targets' and
+`dired-hide-details-hide-information-lines'."
   :group 'dired
   (unless (derived-mode-p 'dired-mode)
     (error "Not a Dired buffer"))

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 0befb41826b5c440c23f71e7ba06c08d6df1fd44..00058652aef2af555c6b4afd47e4f34cb8d3df37 100644 (file)
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1426,12 +1426,7 @@ options:
 
 You can customize `cua-enable-cua-keys' to completely disable the
 CUA bindings, or `cua-prefix-override-inhibit-delay' to change
-the prefix fallback behavior.
-
-CUA mode manages Transient Mark mode internally.  Trying to disable
-Transient Mark mode while CUA mode is enabled does not work; if you
-only want to highlight the region when it is selected using a
-shifted movement key, set `cua-highlight-region-shift-only'."
+the prefix fallback behavior."
   :global t
   :group 'cua
   :set-after '(cua-enable-modeline-indications