From a48868a7d83a1f0ec2297cc254abaae176233d79 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Wed, 6 Jul 2011 19:10:36 +0200 Subject: [PATCH] * dired.el (dired-mode): Clarify "unmark or unflag". (dired-unmark-backward): Ditto. (dired-flag-backup-files): Ditto. * dired-x.el (dired-mark-sexp): Ditto. Fixes: debbugs:8770 --- lisp/ChangeLog | 8 ++++++++ lisp/dired-x.el | 2 +- lisp/dired.el | 17 +++++++++-------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6625790370e..5dcdbad05b5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2011-07-06 Lars Magne Ingebrigtsen + + * dired.el (dired-mode): Clarify "unmark or unflag" (bug#8770). + (dired-unmark-backward): Ditto. + (dired-flag-backup-files): Ditto. + + * dired-x.el (dired-mark-sexp): Ditto. + 2011-07-06 Richard Stallman * mail/rmailmm.el: Give entity a new slot, TRUNCATED. diff --git a/lisp/dired-x.el b/lisp/dired-x.el index ca89d07ea7f..8395a8b905f 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -1406,7 +1406,7 @@ Considers buffers closer to the car of `buffer-list' to be more recent." (defun dired-mark-sexp (predicate &optional unflag-p) "Mark files for which PREDICATE returns non-nil. -With a prefix arg, unflag those files instead. +With a prefix arg, unmark or unflag those files instead. PREDICATE is a lisp expression that can refer to the following symbols: diff --git a/lisp/dired.el b/lisp/dired.el index 477baa24da1..62bab489fbc 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1812,7 +1812,7 @@ Type \\[dired-mark] to Mark a file or subdirectory for later commands. Mark-using commands display a list of failures afterwards. Type \\[dired-summary] to see why something went wrong. Type \\[dired-unmark] to Unmark a file or all files of an inserted subdirectory. -Type \\[dired-unmark-backward] to back up one line and unflag. +Type \\[dired-unmark-backward] to back up one line and unmark or unflag. Type \\[dired-do-flagged-delete] to delete (eXecute) the files flagged `D'. Type \\[dired-find-file] to Find the current line's file (or dired it in another buffer, if it is a directory). @@ -3028,8 +3028,9 @@ If on a subdir headerline, mark all its files except `.' and `..'." (dired-mark arg))) (defun dired-unmark-backward (arg) - "In Dired, move up lines and remove deletion flag there. -Optional prefix ARG says how many lines to unflag; default is one line." + "In Dired, move up lines and remove marks or deletion flags there. +Optional prefix ARG says how many lines to unmark/unflag; default +is one line." (interactive "p") (dired-unmark (- arg))) @@ -3123,14 +3124,14 @@ The match is against the non-directory part of the filename. Use `^' (defun dired-mark-symlinks (unflag-p) "Mark all symbolic links. -With prefix argument, unflag all those files." +With prefix argument, unmark or unflag all those files." (interactive "P") (let ((dired-marker-char (if unflag-p ?\040 dired-marker-char))) (dired-mark-if (looking-at dired-re-sym) "symbolic link"))) (defun dired-mark-directories (unflag-p) "Mark all directory file lines except `.' and `..'. -With prefix argument, unflag all those files." +With prefix argument, unmark or unflag all those files." (interactive "P") (let ((dired-marker-char (if unflag-p ?\040 dired-marker-char))) (dired-mark-if (and (looking-at dired-re-dir) @@ -3139,7 +3140,7 @@ With prefix argument, unflag all those files." (defun dired-mark-executables (unflag-p) "Mark all executable files. -With prefix argument, unflag all those files." +With prefix argument, unmark or unflag all those files." (interactive "P") (let ((dired-marker-char (if unflag-p ?\040 dired-marker-char))) (dired-mark-if (looking-at dired-re-exe) "executable file"))) @@ -3149,7 +3150,7 @@ With prefix argument, unflag all those files." (defun dired-flag-auto-save-files (&optional unflag-p) "Flag for deletion files whose names suggest they are auto save files. -A prefix argument says to unflag those files instead." +A prefix argument says to unmark or unflag those files instead." (interactive "P") (let ((dired-marker-char (if unflag-p ?\040 dired-del-marker))) (dired-mark-if @@ -3189,7 +3190,7 @@ A prefix argument says to unflag those files instead." (defun dired-flag-backup-files (&optional unflag-p) "Flag all backup files (names ending with `~') for deletion. -With prefix argument, unflag these files." +With prefix argument, unmark or unflag these files." (interactive "P") (let ((dired-marker-char (if unflag-p ?\s dired-del-marker))) (dired-mark-if -- 2.39.2