diff options
| author | Glenn Morris | 2014-01-27 16:26:48 -0500 |
|---|---|---|
| committer | Glenn Morris | 2014-01-27 16:26:48 -0500 |
| commit | 52695556f3cd5d83e28461dc2a8fa348637cb793 (patch) | |
| tree | b25b026ed56f335f73b891b32825216a5b20c9d7 | |
| parent | 68d01ccc30b04692993748185f9a65b4867a219e (diff) | |
| download | emacs-52695556f3cd5d83e28461dc2a8fa348637cb793.tar.gz emacs-52695556f3cd5d83e28461dc2a8fa348637cb793.zip | |
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.
| -rw-r--r-- | doc/emacs/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/emacs/dired.texi | 30 | ||||
| -rw-r--r-- | etc/NEWS | 6 | ||||
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/dired.el | 12 | ||||
| -rw-r--r-- | lisp/emulation/cua-base.el | 7 |
6 files changed, 33 insertions, 33 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 4d47bdad73b..bac170eaf3a 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-01-27 Glenn Morris <rgm@gnu.org> | 1 | 2014-01-27 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * dired.texi (Misc Dired Features): Copyedits for hide-details. | ||
| 4 | |||
| 3 | * buffers.texi (List Buffers): Tiny edit. | 5 | * buffers.texi (List Buffers): Tiny edit. |
| 4 | 6 | ||
| 5 | * calendar.texi (Time Intervals): Update for files in ~/.emacs.d/. | 7 | * calendar.texi (Time Intervals): Update for files in ~/.emacs.d/. |
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index b7de1bdf3aa..70553c13747 100644 --- 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 | |||
| 1382 | a regular expression search. @xref{Repeat Isearch}, for information | 1382 | a regular expression search. @xref{Repeat Isearch}, for information |
| 1383 | about search repetition. | 1383 | about search repetition. |
| 1384 | 1384 | ||
| 1385 | @cindex Adding to the kill ring in Dired. | 1385 | @cindex adding to the kill ring in Dired |
| 1386 | @kindex w @r{(Dired)} | 1386 | @kindex w @r{(Dired)} |
| 1387 | @findex dired-copy-filename-as-kill | 1387 | @findex dired-copy-filename-as-kill |
| 1388 | The command @kbd{w} (@code{dired-copy-filename-as-kill}) puts the | 1388 | 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 | |||
| 1403 | it added to the kill ring, so you can use it to display the list of | 1403 | it added to the kill ring, so you can use it to display the list of |
| 1404 | currently marked files in the echo area. | 1404 | currently marked files in the echo area. |
| 1405 | 1405 | ||
| 1406 | @kindex ( @r{(Dired)} | ||
| 1407 | @findex dired-hide-details-mode | ||
| 1408 | @vindex dired-hide-details-hide-symlink-targets | ||
| 1409 | @vindex dired-hide-details-hide-information-lines | ||
| 1410 | @cindex hiding details in Dired | ||
| 1411 | The command @kbd{(} (@code{dired-hide-details-mode}) toggles whether | ||
| 1412 | details, such as ownership or file permissions, are visible in the | ||
| 1413 | current Dired buffer. By default, it also hides the targets of | ||
| 1414 | symbolic links, and all lines other than the header line and | ||
| 1415 | file/directory listings. To change this, customize the options | ||
| 1416 | @code{dired-hide-details-hide-symlink-targets} and | ||
| 1417 | @code{dired-hide-details-hide-information-lines}, respectively. | ||
| 1418 | |||
| 1406 | @cindex Dired and version control | 1419 | @cindex Dired and version control |
| 1407 | If the directory you are visiting is under version control | 1420 | If the directory you are visiting is under version control |
| 1408 | (@pxref{Version Control}), then the normal VC diff and log commands | 1421 | (@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 | |||
| 1440 | to the file in that directory. Precisely which action is taken is | 1453 | to the file in that directory. Precisely which action is taken is |
| 1441 | determined by the originating program. Dragging files out of a Dired | 1454 | determined by the originating program. Dragging files out of a Dired |
| 1442 | buffer is currently not supported. | 1455 | buffer is currently not supported. |
| 1443 | |||
| 1444 | @kindex ( @r{(Dired)} | ||
| 1445 | @c ) | ||
| 1446 | @findex dired-hide-details-mode | ||
| 1447 | @vindex dired-hide-details-hide-symlink-targets | ||
| 1448 | @vindex dired-hide-details-hide-information-lines | ||
| 1449 | @cindex Hide details in Dired. | ||
| 1450 | The command @kbd{(} (@code{dired-hide-details-mode}) toggles whether | ||
| 1451 | details, such as ownership or file permissions, are hidden. If the | ||
| 1452 | variable @code{dired-hide-details-hide-symlink-targets} is | ||
| 1453 | non-@code{nil} then targets of symbolic links are hidden as well. A | ||
| 1454 | non-@code{nil} value for the variable | ||
| 1455 | @code{dired-hide-details-hide-information-lines} means that all lines | ||
| 1456 | other than the header and lines containing files and directories are | ||
| 1457 | hidden. | ||
| @@ -432,6 +432,7 @@ For example, this enables parsing of macros which open new namespaces. | |||
| 432 | Hence, you can now enable it independently from `transient-mark-mode', | 432 | Hence, you can now enable it independently from `transient-mark-mode', |
| 433 | `delete-selection-mode', and `shift-select-mode'. | 433 | `delete-selection-mode', and `shift-select-mode'. |
| 434 | 434 | ||
| 435 | --- | ||
| 435 | *** `cua-highlight-region-shift-only' is now obsolete. | 436 | *** `cua-highlight-region-shift-only' is now obsolete. |
| 436 | You can disable `transient-mark-mode' to get the same result. | 437 | You can disable `transient-mark-mode' to get the same result. |
| 437 | 438 | ||
| @@ -458,9 +459,8 @@ restoring the frame/window configuration (frameset). Additional options | |||
| 458 | and `desktop-restore-forces-onscreen' offer further customization. | 459 | and `desktop-restore-forces-onscreen' offer further customization. |
| 459 | 460 | ||
| 460 | +++ | 461 | +++ |
| 461 | ** Dired | 462 | ** New Dired minor mode `dired-hide-details-mode' toggles whether details, |
| 462 | 463 | such as file ownership or permissions, are visible. | |
| 463 | *** New minor mode `dired-hide-details-mode' hides details. | ||
| 464 | 464 | ||
| 465 | ** Eldoc Mode works properly in the minibuffer. | 465 | ** Eldoc Mode works properly in the minibuffer. |
| 466 | 466 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 84d263aa62c..0399b5e0fe7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | 2014-01-27 Reuben Thomas <rrt@sc3d.org> | 1 | 2014-01-27 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * whitespace.el (whitespace-enable-predicate): fix sense of comment. | 3 | * emulation/cua-base.el (cua-mode): Doc fix. |
| 4 | Fixes bug #16564, from change of 2013-03-10. | ||
| 5 | 4 | ||
| 6 | 2014-01-27 Glenn Morris <rgm@gnu.org> | 5 | * dired.el (dired-hide-details-hide-symlink-targets) |
| 6 | (dired-hide-details-hide-information-lines) | ||
| 7 | (dired-hide-details-mode): Doc fixes. | ||
| 7 | 8 | ||
| 8 | * shadowfile.el (shadow-info-file, shadow-todo-file): Doc fix. | 9 | * shadowfile.el (shadow-info-file, shadow-todo-file): Doc fix. |
| 9 | * strokes.el (strokes-file): Doc fix. Bump :version. | 10 | * strokes.el (strokes-file): Doc fix. Bump :version. |
diff --git a/lisp/dired.el b/lisp/dired.el index a30f34bc43a..e31912aa3cc 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -241,13 +241,13 @@ new Dired buffers." | |||
| 241 | :group 'dired) | 241 | :group 'dired) |
| 242 | 242 | ||
| 243 | (defcustom dired-hide-details-hide-symlink-targets t | 243 | (defcustom dired-hide-details-hide-symlink-targets t |
| 244 | "If non-nil, `dired-hide-details-mode' hides symbolic link targets." | 244 | "Non-nil means `dired-hide-details-mode' hides symbolic link targets." |
| 245 | :type 'boolean | 245 | :type 'boolean |
| 246 | :version "24.4" | 246 | :version "24.4" |
| 247 | :group 'dired) | 247 | :group 'dired) |
| 248 | 248 | ||
| 249 | (defcustom dired-hide-details-hide-information-lines t | 249 | (defcustom dired-hide-details-hide-information-lines t |
| 250 | "Non-nil means hide lines other than header and file/dir lines." | 250 | "Non-nil means `dired-hide-details-mode' hides all but header and file lines." |
| 251 | :type 'boolean | 251 | :type 'boolean |
| 252 | :version "24.4" | 252 | :version "24.4" |
| 253 | :group 'dired) | 253 | :group 'dired) |
| @@ -2267,10 +2267,14 @@ unchanged." | |||
| 2267 | (substring file (match-end 0)) | 2267 | (substring file (match-end 0)) |
| 2268 | file)) | 2268 | file)) |
| 2269 | 2269 | ||
| 2270 | ;;; Minor mode for hiding details | ||
| 2271 | ;;;###autoload | 2270 | ;;;###autoload |
| 2272 | (define-minor-mode dired-hide-details-mode | 2271 | (define-minor-mode dired-hide-details-mode |
| 2273 | "Hide details in Dired mode." | 2272 | "Toggle visibility of detailed information in current Dired buffer. |
| 2273 | When this minor mode is enabled, details such as file ownership and | ||
| 2274 | permissions are hidden from view. | ||
| 2275 | |||
| 2276 | See options: `dired-hide-details-hide-symlink-targets' and | ||
| 2277 | `dired-hide-details-hide-information-lines'." | ||
| 2274 | :group 'dired | 2278 | :group 'dired |
| 2275 | (unless (derived-mode-p 'dired-mode) | 2279 | (unless (derived-mode-p 'dired-mode) |
| 2276 | (error "Not a Dired buffer")) | 2280 | (error "Not a Dired buffer")) |
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 0befb41826b..00058652aef 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el | |||
| @@ -1426,12 +1426,7 @@ options: | |||
| 1426 | 1426 | ||
| 1427 | You can customize `cua-enable-cua-keys' to completely disable the | 1427 | You can customize `cua-enable-cua-keys' to completely disable the |
| 1428 | CUA bindings, or `cua-prefix-override-inhibit-delay' to change | 1428 | CUA bindings, or `cua-prefix-override-inhibit-delay' to change |
| 1429 | the prefix fallback behavior. | 1429 | the prefix fallback behavior." |
| 1430 | |||
| 1431 | CUA mode manages Transient Mark mode internally. Trying to disable | ||
| 1432 | Transient Mark mode while CUA mode is enabled does not work; if you | ||
| 1433 | only want to highlight the region when it is selected using a | ||
| 1434 | shifted movement key, set `cua-highlight-region-shift-only'." | ||
| 1435 | :global t | 1430 | :global t |
| 1436 | :group 'cua | 1431 | :group 'cua |
| 1437 | :set-after '(cua-enable-modeline-indications | 1432 | :set-after '(cua-enable-modeline-indications |