aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2012-01-12 21:32:07 -0500
committerGlenn Morris2012-01-12 21:32:07 -0500
commite517eda4d0d6da5d4b8f12be1608fb5e17c455ff (patch)
tree03999b08caf9619b695c6908541bbad33e24f80f /lisp
parent1165ec6e4b0da8eaeee0ce203b55492c61e180c5 (diff)
downloademacs-e517eda4d0d6da5d4b8f12be1608fb5e17c455ff.tar.gz
emacs-e517eda4d0d6da5d4b8f12be1608fb5e17c455ff.zip
find-ls-option doc fixes (bug#10262)
* doc/emacs/dired.texi (Dired and Find): Clarify find-ls-options. * lisp/find-dired.el (find-ls-option): Doc fix.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/find-dired.el18
2 files changed, 18 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8d8ab379fa..be7c45339fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-01-13 Glenn Morris <rgm@gnu.org>
2
3 * find-dired.el (find-ls-option): Doc fix. (Bug#10262)
4
12012-01-12 Glenn Morris <rgm@gnu.org> 52012-01-12 Glenn Morris <rgm@gnu.org>
2 6
3 * mail/sendmail.el (mail-mode): Update paragraph-separate for 7 * mail/sendmail.el (mail-mode): Update paragraph-separate for
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 3fda2153e09..9c1c8eedffd 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -63,10 +63,20 @@ than the latter."
63 (cons 63 (cons
64 (format "-exec ls -ld {} %s" find-exec-terminator) 64 (format "-exec ls -ld {} %s" find-exec-terminator)
65 "-ld")) 65 "-ld"))
66 "Description of the option to `find' to produce an `ls -l'-type listing. 66 "A pair of options to produce and parse an `ls -l'-type list from `find'.
67This is a cons of two strings (FIND-OPTION . LS-SWITCHES). FIND-OPTION 67This is a cons of two strings (FIND-OPTION . LS-SWITCHES).
68gives the option (or options) to `find' that produce the desired output. 68FIND-OPTION is the option (or options) passed to `find' to produce
69LS-SWITCHES is a list of `ls' switches to tell dired how to parse the output." 69a file listing in the desired format. LS-SWITCHES is a set of
70`ls' switches that tell dired how to parse the output of `find'.
71
72The two options must be set to compatible values.
73For example, to use human-readable file sizes with GNU ls:
74 \(\"-exec ls -ldh {} +\" . \"-ldh\")
75
76To use GNU find's inbuilt \"-ls\" option to list files:
77 \(\"-ls\" . \"-dilsb\")
78since GNU find's output has the same format as using GNU ls with
79the options \"-dilsb\"."
70 :version "24.1" ; add tests for -ls and -exec + support 80 :version "24.1" ; add tests for -ls and -exec + support
71 :type '(cons (string :tag "Find Option") 81 :type '(cons (string :tag "Find Option")
72 (string :tag "Ls Switches")) 82 (string :tag "Ls Switches"))