aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2014-01-27 16:26:48 -0500
committerGlenn Morris2014-01-27 16:26:48 -0500
commit52695556f3cd5d83e28461dc2a8fa348637cb793 (patch)
treeb25b026ed56f335f73b891b32825216a5b20c9d7 /lisp
parent68d01ccc30b04692993748185f9a65b4867a219e (diff)
downloademacs-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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/dired.el12
-rw-r--r--lisp/emulation/cua-base.el7
3 files changed, 14 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 84d263aa62c..0399b5e0fe7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,10 @@
12014-01-27 Reuben Thomas <rrt@sc3d.org> 12014-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
62014-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.
2273When this minor mode is enabled, details such as file ownership and
2274permissions are hidden from view.
2275
2276See 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
1427You can customize `cua-enable-cua-keys' to completely disable the 1427You can customize `cua-enable-cua-keys' to completely disable the
1428CUA bindings, or `cua-prefix-override-inhibit-delay' to change 1428CUA bindings, or `cua-prefix-override-inhibit-delay' to change
1429the prefix fallback behavior. 1429the prefix fallback behavior."
1430
1431CUA mode manages Transient Mark mode internally. Trying to disable
1432Transient Mark mode while CUA mode is enabled does not work; if you
1433only want to highlight the region when it is selected using a
1434shifted 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